From 3ee48be0c0c2ecbe9c7f8ee87b32bc4b9c6fe97e Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Sun, 8 Jun 2025 22:55:43 +0000 Subject: [PATCH 01/19] Bump version from 1.4.2 to 1.4.2-SNAPSHOT0 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index baf0be1d..888fb09b 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2 + 1.4.2-SNAPSHOT0 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 00e7bc6c..27b6aabb 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2 + 1.4.2-SNAPSHOT0 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index 7a655623..7c3b7230 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2 + 1.4.2-SNAPSHOT0 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 2d38566a..082af36d 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2 + 1.4.2-SNAPSHOT0 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index 449fee1d..40362507 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2 + 1.4.2-SNAPSHOT0 4.0.0 diff --git a/pom.xml b/pom.xml index 32e28d3e..10744a07 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2 + 1.4.2-SNAPSHOT0 pom From 666d5502101861a46368cdecb41bd467778d310f Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Mon, 9 Jun 2025 11:07:22 +0200 Subject: [PATCH 02/19] Fixed NPE on ServerListPing if plugin isn't fully started / arenaregistry not ready --- .../minigamesbox/classic/arena/managers/BungeeManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/managers/BungeeManager.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/managers/BungeeManager.java index d5e20e1f..fef651ce 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/managers/BungeeManager.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/managers/BungeeManager.java @@ -76,6 +76,10 @@ public void connectToHub(Player player) { @EventHandler(priority = EventPriority.HIGHEST) public void onServerListPing(ServerListPingEvent event) { + if(plugin.getArenaRegistry() == null) { + //can be null on early request after server startup + return; + } if(plugin.getArenaRegistry().getArenas().isEmpty() || !config.getBoolean("MOTD.Manager")) { return; } From 795e40520f7bcdc09a27664b8d7bc4ed2769e0cb Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Mon, 9 Jun 2025 09:07:50 +0000 Subject: [PATCH 03/19] Bump version from 1.4.2-SNAPSHOT0 to 1.4.2-SNAPSHOT1 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index 888fb09b..3aa96474 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT0 + 1.4.2-SNAPSHOT1 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 27b6aabb..231aed04 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT0 + 1.4.2-SNAPSHOT1 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index 7c3b7230..a1cd11db 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT0 + 1.4.2-SNAPSHOT1 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 082af36d..a68045ff 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT0 + 1.4.2-SNAPSHOT1 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index 40362507..db04db80 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT0 + 1.4.2-SNAPSHOT1 4.0.0 diff --git a/pom.xml b/pom.xml index 10744a07..be0c9d78 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT0 + 1.4.2-SNAPSHOT1 pom From f4afff0cc4acd5dd6339ae831430e7c765e104c5 Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Wed, 9 Jul 2025 18:17:10 +0200 Subject: [PATCH 04/19] * Added 1.21.6-7 support! * Updated XSeries to 13.3.3 * Updated FastBoard to 2.1.5 * Updated FastInv to 3.1.2 --- .github/CHANGELOG.md | 7 +++++++ .github/building/classic/pom.xml | 2 +- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 8b5f02cb..442f10d4 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,3 +1,10 @@ +### 1.4.3 Release (07.2025) +* Added 1.21.6-7 support! +* Updated XSeries to 13.3.3 +* Updated FastBoard to 2.1.5 +* Updated FastInv to 3.1.2 +* Fixed NPE on ServerListPing if plugin isn't fully started / arenaregistry not ready + ### 1.4.2 Release (09.06.2025) * Added BLOCK_IN_GAME_INTERACTIONS option to block interactions whileas ingame * Added onArrowHitRemoveProjectile event to remove projectiles which got shoot from InGame Players diff --git a/.github/building/classic/pom.xml b/.github/building/classic/pom.xml index 486888bb..cec21596 100644 --- a/.github/building/classic/pom.xml +++ b/.github/building/classic/pom.xml @@ -68,7 +68,7 @@ fr.mrmicky fastboard - 2.1.3 + 2.1.5 true diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index 3aa96474..61545153 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -53,7 +53,7 @@ com.github.cryptomorin XSeries - 13.3.1 + 13.3.3 provided true diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 231aed04..f82954ea 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -87,7 +87,7 @@ com.github.cryptomorin XSeries - 13.3.1 + 13.3.3 compile true diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index a68045ff..0726edd9 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -45,7 +45,7 @@ fr.mrmicky FastInv - 3.1.1 + 3.1.2 From 92f29dca54bc337d386ffb349fc091ba03cfed9e Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Wed, 9 Jul 2025 16:17:36 +0000 Subject: [PATCH 05/19] Bump version from 1.4.2-SNAPSHOT1 to 1.4.2-SNAPSHOT2 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index 61545153..f06a516d 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT1 + 1.4.2-SNAPSHOT2 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index f82954ea..ed0392c8 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT1 + 1.4.2-SNAPSHOT2 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index a1cd11db..a99af209 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT1 + 1.4.2-SNAPSHOT2 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 0726edd9..2fcd4a43 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT1 + 1.4.2-SNAPSHOT2 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index db04db80..a663f06b 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT1 + 1.4.2-SNAPSHOT2 4.0.0 diff --git a/pom.xml b/pom.xml index be0c9d78..47d36522 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT1 + 1.4.2-SNAPSHOT2 pom From 9a6de78abfca8996a62a58e9a699f16e74448b87 Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Wed, 9 Jul 2025 18:25:53 +0200 Subject: [PATCH 06/19] Updated FastInv to v3.1.2 --- MiniGamesBox Inventory/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 2fcd4a43..76334df0 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -45,7 +45,7 @@ fr.mrmicky FastInv - 3.1.2 + v3.1.2 From e4d7779f0381fa146042edbbb32ce6b0f1f0afdb Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Wed, 9 Jul 2025 16:26:11 +0000 Subject: [PATCH 07/19] Bump version from 1.4.2-SNAPSHOT2 to 1.4.2-SNAPSHOT3 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index f06a516d..8a24b569 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT2 + 1.4.2-SNAPSHOT3 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index ed0392c8..0ca83fd2 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT2 + 1.4.2-SNAPSHOT3 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index a99af209..34745f2c 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT2 + 1.4.2-SNAPSHOT3 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 76334df0..47e9ae86 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT2 + 1.4.2-SNAPSHOT3 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index a663f06b..bc9f466e 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT2 + 1.4.2-SNAPSHOT3 4.0.0 diff --git a/pom.xml b/pom.xml index 47d36522..20cd1902 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT2 + 1.4.2-SNAPSHOT3 pom From 3328cceb3edf33c9759950527fa03316bd77d7db Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Wed, 9 Jul 2025 22:50:49 +0200 Subject: [PATCH 08/19] Renamed inputs on MiscUtils to be more confident --- .../classic/utils/misc/MiscUtils.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java index 68112db7..04e855af 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java @@ -55,21 +55,21 @@ public class MiscUtils { private MiscUtils() { } - public static String matchColorRegex(String s) { + public static String matchColorRegex(String message) { if(Version.isCurrentLower(Version.v1_16)) { - return s; + return message; } - Matcher matcher = PATTERN.matcher(s); + Matcher matcher = PATTERN.matcher(message); while(matcher.find()) { try { - s = s.replace(matcher.group(0), net.md_5.bungee.api.ChatColor.of("#" + matcher.group(1)).toString()); - } catch(Exception e) { - System.err.println("Invalid hex color: " + e.getLocalizedMessage()); + message = message.replace(matcher.group(0), net.md_5.bungee.api.ChatColor.of("#" + matcher.group(1)).toString()); + } catch(Exception exception) { + System.err.println("Invalid hex color: " + exception.getLocalizedMessage() + " && " + message); } } - return s; + return message; } @Deprecated @@ -87,8 +87,8 @@ public static Optional getEntityAttribute(LivingEntity entity * @param location location to spawn firework there */ public static void spawnRandomFirework(Location location) { - Firework fw = (Firework) location.getWorld().spawnEntity(location, XEntityType.FIREWORK_ROCKET.get()); - FireworkMeta fwm = fw.getFireworkMeta(); + Firework firework = (Firework) location.getWorld().spawnEntity(location, XEntityType.FIREWORK_ROCKET.get()); + FireworkMeta fireworkMeta = firework.getFireworkMeta(); //Get the type FireworkEffect.Type type; @@ -124,11 +124,11 @@ public static void spawnRandomFirework(Location location) { .with(type).trail(RANDOM.nextBoolean()).build(); //Then apply the effect to the meta - fwm.addEffect(effect); + fireworkMeta.addEffect(effect); //Generate some random power and set it - fwm.setPower(RANDOM.nextInt(2) + 1); - fw.setFireworkMeta(fwm); + fireworkMeta.setPower(RANDOM.nextInt(2) + 1); + firework.setFireworkMeta(fireworkMeta); } /** From f2df101e89e08cbbb4cab6757550fb08c6501f44 Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Wed, 9 Jul 2025 20:51:05 +0000 Subject: [PATCH 09/19] Bump version from 1.4.2-SNAPSHOT3 to 1.4.2-SNAPSHOT4 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index 8a24b569..e821ea25 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT3 + 1.4.2-SNAPSHOT4 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 0ca83fd2..7dd69dc7 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT3 + 1.4.2-SNAPSHOT4 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index 34745f2c..8358f377 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT3 + 1.4.2-SNAPSHOT4 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 47e9ae86..9f43ebbd 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT3 + 1.4.2-SNAPSHOT4 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index bc9f466e..37f2528e 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT3 + 1.4.2-SNAPSHOT4 4.0.0 diff --git a/pom.xml b/pom.xml index 20cd1902..c6a560e7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT3 + 1.4.2-SNAPSHOT4 pom From ddd535f1d6996699e75534b858b32b0620387860 Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Wed, 9 Jul 2025 23:20:42 +0200 Subject: [PATCH 10/19] Only support 6 digit long hex code --- .../projects/minigamesbox/classic/utils/misc/MiscUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java index 04e855af..0a648a34 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/misc/MiscUtils.java @@ -50,7 +50,7 @@ public class MiscUtils { private static final Random RANDOM = new Random(); - private static final Pattern PATTERN = Pattern.compile("&?#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})"); + private static final Pattern PATTERN = Pattern.compile("&?#([A-Fa-f0-9]{6})"); private MiscUtils() { } @@ -65,7 +65,7 @@ public static String matchColorRegex(String message) { try { message = message.replace(matcher.group(0), net.md_5.bungee.api.ChatColor.of("#" + matcher.group(1)).toString()); } catch(Exception exception) { - System.err.println("Invalid hex color: " + exception.getLocalizedMessage() + " && " + message); + System.err.println("Invalidh hex color: " + exception.getLocalizedMessage() + " && " + message); } } From 4dc023b5b0c7496f4e731509d7461fa15b6d40f5 Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Thu, 10 Jul 2025 15:01:26 +0000 Subject: [PATCH 11/19] Bump version from 1.4.2-SNAPSHOT4 to 1.4.2-SNAPSHOT5 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index e821ea25..ccd4617a 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT4 + 1.4.2-SNAPSHOT5 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 7dd69dc7..d20a1d0c 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT4 + 1.4.2-SNAPSHOT5 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index 8358f377..b407ea4e 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT4 + 1.4.2-SNAPSHOT5 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 9f43ebbd..f04e1369 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT4 + 1.4.2-SNAPSHOT5 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index 37f2528e..88f159ac 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT4 + 1.4.2-SNAPSHOT5 4.0.0 diff --git a/pom.xml b/pom.xml index c6a560e7..e50b6808 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT4 + 1.4.2-SNAPSHOT5 pom From 893cb55855bd8a9b66c3d6c988d0a4ba172d722e Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Thu, 10 Jul 2025 17:08:05 +0200 Subject: [PATCH 12/19] Updated pom.xml --- MiniGamesBox Classic/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index d20a1d0c..e419adfe 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -68,7 +68,7 @@ fr.mrmicky fastboard - 2.1.4 + 2.1.5 compile true From 06b1739ec44a681d909b0beef10cbf91dddd3f56 Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Thu, 10 Jul 2025 15:08:36 +0000 Subject: [PATCH 13/19] Bump version from 1.4.2-SNAPSHOT5 to 1.4.2-SNAPSHOT6 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index ccd4617a..a56e6f1e 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT5 + 1.4.2-SNAPSHOT6 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index e419adfe..19de5723 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT5 + 1.4.2-SNAPSHOT6 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index b407ea4e..c15b3c2a 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT5 + 1.4.2-SNAPSHOT6 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index f04e1369..0448dc9c 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT5 + 1.4.2-SNAPSHOT6 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index 88f159ac..746f3f3b 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT5 + 1.4.2-SNAPSHOT6 4.0.0 diff --git a/pom.xml b/pom.xml index e50b6808..36d7f2ed 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT5 + 1.4.2-SNAPSHOT6 pom From dd7784c1615d305791601bf5dd2bd9875572fb3b Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Thu, 10 Jul 2025 18:34:25 +0200 Subject: [PATCH 14/19] Added prefixes to setup completed messages --- .../classic/handlers/setup/items/category/BooleanItem.java | 4 ++-- .../classic/handlers/setup/items/category/CountItem.java | 2 +- .../classic/handlers/setup/items/category/SwitchItem.java | 4 ++-- .../classic/handlers/setup/items/category/ValueItem.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/BooleanItem.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/BooleanItem.java index 81b424b7..6dea1d2a 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/BooleanItem.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/BooleanItem.java @@ -103,7 +103,7 @@ public Prompt acceptInput(ConversationContext context, String input) { context.getForWhom().sendRawMessage(new MessageBuilder("&e✖ Only a value of the list is allowed, try again by clicking the item again").build()); return Prompt.END_OF_CONVERSATION; } - context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).build()); + context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).prefix().build()); setupInventory.setConfig(keyName, Boolean.valueOf(input)); return Prompt.END_OF_CONVERSATION; } @@ -113,7 +113,7 @@ public Prompt acceptInput(ConversationContext context, String input) { boolean option = setupInventory.getConfig().getBoolean("instances." + setupInventory.getArenaKey() + "." + keyName, false); int position = 2; boolean newOption = !option; - event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).build()); + event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).prefix().build()); setupInventory.setConfig(keyName, newOption); InventoryHolder holder = event.getInventory().getHolder(); if(holder instanceof RefreshableFastInv) { diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/CountItem.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/CountItem.java index 9d82d3f3..dfb78c63 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/CountItem.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/CountItem.java @@ -132,7 +132,7 @@ public void onClick(InventoryClickEvent event) { countInput = 1; } updateArenaFile(countInput); - conversationContext.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aCount for " + name.toUpperCase() + " on " + setupInventory.getArenaKey() + " set to " + countInput).build()); + conversationContext.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aCount for " + name.toUpperCase() + " on " + setupInventory.getArenaKey() + " set to " + countInput).prefix().build()); //considerable to open setup inventory again? return Prompt.END_OF_CONVERSATION; } diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/SwitchItem.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/SwitchItem.java index aae2b950..1ecf4347 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/SwitchItem.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/SwitchItem.java @@ -104,7 +104,7 @@ public Prompt acceptInput(ConversationContext context, String input) { context.getForWhom().sendRawMessage(new MessageBuilder("&e✖ Only a value of the list is allowed, try again by clicking the item again").build()); return Prompt.END_OF_CONVERSATION; } - context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).build()); + context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + input).prefix().build()); setupInventory.setConfig(keyName, input); return Prompt.END_OF_CONVERSATION; } @@ -114,7 +114,7 @@ public Prompt acceptInput(ConversationContext context, String input) { String option = setupInventory.getConfig().getString("instances." + setupInventory.getArenaKey() + "." + keyName, switches.get(0)); int position = switches.indexOf(option); String newOption = switches.get(switches.size() - 1 <= position ? 0 : position + 1); - event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).build()); + event.getWhoClicked().sendMessage(new MessageBuilder("&e✔ Completed | &aSet " + name.toUpperCase() + " " + setupInventory.getArenaKey() + " to " + newOption).prefix().build()); setupInventory.setConfig(keyName, newOption); InventoryHolder holder = event.getInventory().getHolder(); if(holder instanceof RefreshableFastInv) { diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/ValueItem.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/ValueItem.java index 5580e819..03cb1cb0 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/ValueItem.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/items/category/ValueItem.java @@ -95,7 +95,7 @@ public void onClick(InventoryClickEvent event) { @Override public Prompt acceptInput(ConversationContext context, String input) { String name = new MessageBuilder(input, false).build(); - context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aName of &7" + setupInventory.getArenaKey() + " &aset to &r" + name).build()); + context.getForWhom().sendRawMessage(new MessageBuilder("&e✔ Completed | &aName of &7" + setupInventory.getArenaKey() + " &aset to &r" + name).prefix().build()); setupInventory.setConfig(keyName, name); return Prompt.END_OF_CONVERSATION; } From 96a0c50490d5747fc568df5e8bb5a8958331ce2e Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Thu, 10 Jul 2025 16:34:45 +0000 Subject: [PATCH 15/19] Bump version from 1.4.2-SNAPSHOT6 to 1.4.2-SNAPSHOT7 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index a56e6f1e..c076c4c0 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT6 + 1.4.2-SNAPSHOT7 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 19de5723..2444a3ba 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT6 + 1.4.2-SNAPSHOT7 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index c15b3c2a..25228bf4 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT6 + 1.4.2-SNAPSHOT7 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 0448dc9c..966aa280 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT6 + 1.4.2-SNAPSHOT7 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index 746f3f3b..fbfd3edf 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT6 + 1.4.2-SNAPSHOT7 4.0.0 diff --git a/pom.xml b/pom.xml index 36d7f2ed..de17cf46 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT6 + 1.4.2-SNAPSHOT7 pom From dfbbb393314b0b968e24f5cca766ce69da4cae7d Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Thu, 10 Jul 2025 22:36:21 +0200 Subject: [PATCH 16/19] Fixed NSM on CRAFTING TABLE usage at mc 1.8.8 --- .github/CHANGELOG.md | 5 +++- .../minigamesbox/classic/events/Events.java | 3 ++- .../classic/utils/version/VersionUtils.java | 24 ++++++++++++------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 442f10d4..a9466915 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,9 +1,12 @@ -### 1.4.3 Release (07.2025) +### 1.4.3 Release (10.07.2025) * Added 1.21.6-7 support! * Updated XSeries to 13.3.3 * Updated FastBoard to 2.1.5 * Updated FastInv to 3.1.2 * Fixed NPE on ServerListPing if plugin isn't fully started / arenaregistry not ready +* Fixed NSM on CRAFTING TABLE usage at mc 1.8.8 +* Internal Code Cleanup such as prefixes and MiscUtils +* Changed Hex code support to only support 6 digit long hex code! ### 1.4.2 Release (09.06.2025) * Added BLOCK_IN_GAME_INTERACTIONS option to block interactions whileas ingame diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java index 7a781180..e2481620 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java @@ -44,6 +44,7 @@ import plugily.projects.minigamesbox.classic.PluginMain; import plugily.projects.minigamesbox.classic.handlers.language.MessageBuilder; import plugily.projects.minigamesbox.classic.utils.version.ServerVersion; +import plugily.projects.minigamesbox.classic.utils.version.VersionUtils; import plugily.projects.minigamesbox.classic.utils.version.events.api.PlugilyPlayerInteractEvent; import plugily.projects.minigamesbox.classic.utils.version.events.api.PlugilyPlayerSwapHandItemsEvent; @@ -189,7 +190,7 @@ public void onCraft(PlugilyPlayerInteractEvent event) { return; } if(event.getPlayer().getTargetBlock(null, 7).getType() == XMaterial.CRAFTING_TABLE.parseMaterial()) { - if(event.getAction().isRightClick()) { + if(VersionUtils.isRightClick(event.getAction())) { event.setCancelled(true); } } diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/version/VersionUtils.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/version/VersionUtils.java index 547eb0f9..ec3883fc 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/version/VersionUtils.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/version/VersionUtils.java @@ -36,6 +36,7 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.event.block.Action; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; @@ -445,7 +446,6 @@ public static double getMaxHealth(LivingEntity entity) { } - java.util.Optional at = MiscUtils.getEntityAttribute(entity, XAttribute.MAX_HEALTH.get()); return at.map(AttributeInstance::getValue).orElse(20D); } @@ -643,16 +643,22 @@ public static Entity spawnEntity(Location location, EntityType entityType) { } public static BannerMeta setBaseColor(BannerMeta meta, DyeColor color) { - BlockStateMeta bsm = (BlockStateMeta) meta; - BlockState state = ((BlockStateMeta) meta).getBlockState(); - if (state instanceof Banner) { - ((Banner) state).setBaseColor(color); - state.update(true); - } - bsm.setBlockState(state); + BlockStateMeta bsm = (BlockStateMeta) meta; + BlockState state = ((BlockStateMeta) meta).getBlockState(); + if(state instanceof Banner) { + ((Banner) state).setBaseColor(color); + state.update(true); + } + bsm.setBlockState(state); return meta; + } + public static boolean isLeftClick(Action action) { + return action == Action.LEFT_CLICK_AIR || action == Action.LEFT_CLICK_BLOCK; + } -} + public static boolean isRightClick(Action action) { + return action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK; + } } From d10e2832607aa67357f0e39981b660506255b523 Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Thu, 10 Jul 2025 20:36:40 +0000 Subject: [PATCH 17/19] Bump version from 1.4.2-SNAPSHOT7 to 1.4.2-SNAPSHOT8 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index c076c4c0..b3670e96 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT7 + 1.4.2-SNAPSHOT8 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 2444a3ba..4f41c210 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT7 + 1.4.2-SNAPSHOT8 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index 25228bf4..c9b1f9ef 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT7 + 1.4.2-SNAPSHOT8 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index 966aa280..eebe4e6c 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT7 + 1.4.2-SNAPSHOT8 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index fbfd3edf..671aa031 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT7 + 1.4.2-SNAPSHOT8 4.0.0 diff --git a/pom.xml b/pom.xml index de17cf46..f72f7805 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT7 + 1.4.2-SNAPSHOT8 pom From 3fc7c88bfc9433a5073d96903fba30170aaffefc Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Thu, 10 Jul 2025 23:59:15 +0200 Subject: [PATCH 18/19] Removed dup code --- .../plugily/projects/minigamesbox/classic/events/Events.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java index e2481620..d2efa4fc 100644 --- a/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java +++ b/MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/events/Events.java @@ -194,9 +194,6 @@ public void onCraft(PlugilyPlayerInteractEvent event) { event.setCancelled(true); } } - if(event.getClickedBlock() == null) { - return; - } if(event.getClickedBlock().getType() == XMaterial.PAINTING.parseMaterial() || event.getClickedBlock().getType() == XMaterial.FLOWER_POT.parseMaterial()) { event.setCancelled(true); } From 805674dd9e25b9ef496d0a9211c19d967fced0e6 Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Thu, 10 Jul 2025 21:59:30 +0000 Subject: [PATCH 19/19] Bump version from 1.4.2-SNAPSHOT8 to 1.4.2-SNAPSHOT9 --- MiniGamesBox API/pom.xml | 2 +- MiniGamesBox Classic/pom.xml | 2 +- MiniGamesBox Database/pom.xml | 2 +- MiniGamesBox Inventory/pom.xml | 2 +- MiniGamesBox Utils/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MiniGamesBox API/pom.xml b/MiniGamesBox API/pom.xml index b3670e96..0d129a20 100644 --- a/MiniGamesBox API/pom.xml +++ b/MiniGamesBox API/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT8 + 1.4.2-SNAPSHOT9 4.0.0 diff --git a/MiniGamesBox Classic/pom.xml b/MiniGamesBox Classic/pom.xml index 4f41c210..7024cd48 100644 --- a/MiniGamesBox Classic/pom.xml +++ b/MiniGamesBox Classic/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT8 + 1.4.2-SNAPSHOT9 4.0.0 diff --git a/MiniGamesBox Database/pom.xml b/MiniGamesBox Database/pom.xml index c9b1f9ef..00f3ba44 100644 --- a/MiniGamesBox Database/pom.xml +++ b/MiniGamesBox Database/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT8 + 1.4.2-SNAPSHOT9 4.0.0 diff --git a/MiniGamesBox Inventory/pom.xml b/MiniGamesBox Inventory/pom.xml index eebe4e6c..b44fefd9 100644 --- a/MiniGamesBox Inventory/pom.xml +++ b/MiniGamesBox Inventory/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT8 + 1.4.2-SNAPSHOT9 4.0.0 diff --git a/MiniGamesBox Utils/pom.xml b/MiniGamesBox Utils/pom.xml index 671aa031..0a2d260b 100644 --- a/MiniGamesBox Utils/pom.xml +++ b/MiniGamesBox Utils/pom.xml @@ -23,7 +23,7 @@ minigamesbox plugily.projects - 1.4.2-SNAPSHOT8 + 1.4.2-SNAPSHOT9 4.0.0 diff --git a/pom.xml b/pom.xml index f72f7805..2d527e9e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ plugily.projects minigamesbox - 1.4.2-SNAPSHOT8 + 1.4.2-SNAPSHOT9 pom