From 5a1fb9c31bd9734d99e92f0b54df0f94389c7bcf Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Tue, 15 Jul 2025 19:22:23 +0000 Subject: [PATCH 1/8] Bump version from 5.1.1 to 5.1.1-SNAPSHOT0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e9e5d52..cf778eba 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ plugily.projects buildbattle - 5.1.1 + 5.1.1-SNAPSHOT0 BuildBattle From d17086b7d8e7be0ab04964b3b334939ff82bc746 Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:28:01 +0200 Subject: [PATCH 2/8] Fixed vehicle moving outside of arena plots and other worlds! --- .../plugily/projects/buildbattle/arena/ArenaEvents.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java b/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java index 0c0fe9e3..dee5fbd3 100644 --- a/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java +++ b/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java @@ -296,8 +296,6 @@ public void onEnderchestClick(PlugilyPlayerInteractEvent event) { } } - //TODO recognise plot by location should be added, as current check will go through all plots... - //Alternative use filter!! @EventHandler public void onVehicleMove(VehicleMoveEvent event) { Vehicle vehicle = event.getVehicle(); @@ -306,13 +304,14 @@ public void onVehicleMove(VehicleMoveEvent event) { continue; } for(Plot buildPlot : ((BaseArena) arena).getPlotManager().getPlots()) { - if(buildPlot.getCuboid() != null && !buildPlot.getCuboid().isIn(event.getTo())) { + if(buildPlot.getCuboid() != null && buildPlot.getCuboid().isIn(event.getFrom()) && !buildPlot.getCuboid().isInWithMarge(event.getTo(), 1)) { vehicle.setVelocity(vehicle.getVelocity().zero()); if(vehicle.getType() == XEntityType.MINECART.get()) { ((Minecart) vehicle).setMaxSpeed(0); } else { vehicle.remove(); } + return; } } } @@ -329,6 +328,7 @@ public void onIgniteEvent(BlockIgniteEvent event) { for(Plot buildPlot : ((BaseArena) arena).getPlotManager().getPlots()) { if(buildPlot.getCuboid() != null && buildPlot.getCuboid().isInWithMarge(blockLocation, 5)) { event.setCancelled(true); + return; } } } @@ -346,6 +346,7 @@ public void onPistonRetractEvent(BlockPistonRetractEvent event) { for(Block block : event.getBlocks()) { if(buildPlot.getCuboid() != null && !buildPlot.getCuboid().isInWithMarge(block.getLocation(), -1) && buildPlot.getCuboid().isIn(blockLocation)) { event.setCancelled(true); + return; } } } From adf364aadc4c9af6e221fb9f08295245fcda19a6 Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:28:12 +0200 Subject: [PATCH 3/8] Fixed InventoryView not interface onItemMove --- .../java/plugily/projects/buildbattle/arena/ArenaEvents.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java b/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java index dee5fbd3..f901ecb7 100644 --- a/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java +++ b/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java @@ -55,6 +55,7 @@ import plugily.projects.minigamesbox.classic.utils.version.events.api.PlugilyPlayerPickupArrow; import plugily.projects.minigamesbox.classic.utils.version.xseries.XEntityType; import plugily.projects.minigamesbox.classic.utils.version.xseries.XMaterial; +import plugily.projects.minigamesbox.classic.utils.version.xseries.inventory.XInventoryView; /** * @author Plajer @@ -663,8 +664,8 @@ public void onItemMove(InventoryClickEvent event) { if(baseArena != null && baseArena.getArenaState() != IArenaState.IN_GAME) { if(event.getClickedInventory() == humanEntity.getInventory()) { - if(event.getView().getType() == InventoryType.CRAFTING - || event.getView().getType() == InventoryType.PLAYER) { + if(XInventoryView.of(event.getView()).getType() == InventoryType.CRAFTING + || XInventoryView.of(event.getView()).getType() == InventoryType.PLAYER) { event.setResult(Event.Result.DENY); } } From d0ab9ad6ec64cd6a1ca1656cdaaae99ffe6fef6d Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:30:03 +0200 Subject: [PATCH 4/8] Fixed Method 'org.bukkit.block.banner.PatternType[] org.bukkit.block.banner.PatternType.values()' must be Methodref constant --- .../handlers/menu/registry/banner/BannerMenu.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/plugily/projects/buildbattle/handlers/menu/registry/banner/BannerMenu.java b/src/main/java/plugily/projects/buildbattle/handlers/menu/registry/banner/BannerMenu.java index 1936bc62..50f95c59 100644 --- a/src/main/java/plugily/projects/buildbattle/handlers/menu/registry/banner/BannerMenu.java +++ b/src/main/java/plugily/projects/buildbattle/handlers/menu/registry/banner/BannerMenu.java @@ -34,6 +34,7 @@ import plugily.projects.minigamesbox.classic.utils.helper.ItemBuilder; import plugily.projects.minigamesbox.classic.utils.version.ServerVersion; import plugily.projects.minigamesbox.classic.utils.version.xseries.XMaterial; +import plugily.projects.minigamesbox.classic.utils.version.xseries.XPatternType; import plugily.projects.minigamesbox.inventory.common.item.SimpleClickableItem; import plugily.projects.minigamesbox.inventory.normal.NormalFastInv; @@ -104,17 +105,17 @@ private void prepareBaseStageGui() { private void prepareLayerStageGui() { NormalFastInv gui = new NormalFastInv(54, new MessageBuilder("MENU_OPTION_CONTENT_BANNER_INVENTORY_LAYER").asKey().build()); - for(PatternType pattern : PatternType.values()) { + for(XPatternType pattern : XPatternType.getValues()) { ItemStack item = banner.buildBanner(); BannerMeta meta = (BannerMeta) item.getItemMeta(); DyeColor color = banner.getColor() == DyeColor.BLACK ? DyeColor.WHITE : DyeColor.BLACK; - meta.addPattern(new Pattern(color, pattern)); + meta.addPattern(new Pattern(color, pattern.get())); item.setItemMeta(meta); gui.addItem(new SimpleClickableItem(item, event -> { event.setCancelled(true); - banner.addPattern(new BannerPattern(color, pattern)); + banner.addPattern(new BannerPattern(color, pattern.get())); new BannerMenu(player, banner).openInventory(PatternStage.LAYER_COLOR); })); } From fe1db4a3ca8ae19f9d7a08749db97d238a67ce21 Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:30:34 +0200 Subject: [PATCH 5/8] Fixed InventoryView not interface on getGui @VoteMenu --- .../projects/buildbattle/handlers/themes/vote/VoteMenu.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/plugily/projects/buildbattle/handlers/themes/vote/VoteMenu.java b/src/main/java/plugily/projects/buildbattle/handlers/themes/vote/VoteMenu.java index f46eafd8..fad2e2e7 100644 --- a/src/main/java/plugily/projects/buildbattle/handlers/themes/vote/VoteMenu.java +++ b/src/main/java/plugily/projects/buildbattle/handlers/themes/vote/VoteMenu.java @@ -39,6 +39,7 @@ import plugily.projects.minigamesbox.classic.utils.version.xseries.XEnchantment; import plugily.projects.minigamesbox.classic.utils.version.xseries.XItemFlag; import plugily.projects.minigamesbox.classic.utils.version.xseries.XMaterial; +import plugily.projects.minigamesbox.classic.utils.version.xseries.inventory.XInventoryView; import plugily.projects.minigamesbox.inventory.common.item.ClickableItem; import plugily.projects.minigamesbox.inventory.common.item.SimpleClickableItem; import plugily.projects.minigamesbox.inventory.normal.NormalFastInv; @@ -103,7 +104,7 @@ private NormalFastInv getGUI(Player guiPlayer) { HumanEntity humanEntity = event.getPlayer(); Inventory inventory = event.getInventory(); - if(humanEntity.getOpenInventory().getTopInventory() != inventory) { + if(XInventoryView.of(humanEntity.getOpenInventory()).getTopInventory() != inventory) { humanEntity.openInventory(inventory); } }); From 3f5913244a64a6ba93094ec4124af0ae4cd0e3cb Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Tue, 22 Jul 2025 16:30:42 +0000 Subject: [PATCH 6/8] Bump version from 5.1.1-SNAPSHOT0 to 5.1.1-SNAPSHOT1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf778eba..28402725 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ plugily.projects buildbattle - 5.1.1-SNAPSHOT0 + 5.1.1-SNAPSHOT1 BuildBattle From 92e580c4bfb20785bbeea5b9905d21408d0fba1f Mon Sep 17 00:00:00 2001 From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com> Date: Tue, 22 Jul 2025 21:37:12 +0200 Subject: [PATCH 7/8] Updated CHANGELOG.md --- .github/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index f8928ce2..72da09fe 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -10,6 +10,12 @@ deploy webhooks to print changelog successfully That's all, matcher will stop when detects next line started with `###` match +### 5.1.2 Release +* Fixed InventoryView not interface on getGui @VoteMenu +* Fixed Method 'org.bukkit.block.banner.PatternType[] org.bukkit.block.banner.PatternType.values()' must be Methodref constant +* Fixed InventoryView not interface onItemMove +* Fixed vehicle moving outside of arena plots and other worlds + ### 5.1.1 Release * Fixed liquid flow outside plots and different worlds * Fixed forceplay console command without theme From 12e984e1a896b2477d39b283de5fe43e7cea85cf Mon Sep 17 00:00:00 2001 From: "version-bump[github-action]" <41898282+version-bump[github-action]@users.noreply.github.com> Date: Tue, 22 Jul 2025 19:37:17 +0000 Subject: [PATCH 8/8] Bump version from 5.1.1-SNAPSHOT1 to 5.1.1-SNAPSHOT2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28402725..01635d4c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ plugily.projects buildbattle - 5.1.1-SNAPSHOT1 + 5.1.1-SNAPSHOT2 BuildBattle