diff --git a/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/CastleSiegeTesterTrack.java b/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/CastleSiegeTesterTrack.java index 842810a15..d71ecf911 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/CastleSiegeTesterTrack.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/CastleSiegeTesterTrack.java @@ -28,10 +28,12 @@ public class CastleSiegeTesterTrack extends Track private static final Set OWNERS = Sets.newHashSet( "ca871a3f-349c-474c-9c45-c36f2e679ab3", // Moppletop "852a8acf-7337-40d7-99ec-b08fd99650b5", // KingCrazy_ + "a20d59d1-cfd8-4116-ac27-45d9c7eb4a97", // Artix "3d4b8e73-bc2f-4c62-baaf-78600141794a", // hazeae24 "7b133339-2e02-48ef-9dd4-692415933dc5", // Kreshyy "4e941b23-6e36-48cb-97c4-24f56ea128c1", // DooDooBug25 - "0a4b6d83-8eb0-46aa-bc0f-9b7f04046d52" // Livicus + "0a4b6d83-8eb0-46aa-bc0f-9b7f04046d52", // Livicus + "4f8f5380-ffe1-418d-97a4-0737c6edf352" // Hils ); public CastleSiegeTesterTrack() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java index 10c8c2185..2bae80fa9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java @@ -1,6 +1,5 @@ package nautilus.game.arcade.game.games.castlesiegenew; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -107,7 +106,7 @@ public class CastleSiegeTNTManager implements Listener location.getWorld().playEffect(location.clone().add(0, 0.5, 0), Effect.STEP_SOUND, Material.TNT); } - @EventHandler + @EventHandler(priority = EventPriority.LOW) public void tntPickup(PlayerInteractEvent event) { if (!UtilEvent.isAction(event, ActionType.R_BLOCK)) @@ -123,6 +122,8 @@ public class CastleSiegeTNTManager implements Listener return; } + event.setCancelled(true); + DisguiseBase disguise = _host.getArcadeManager().GetDisguise().getActiveDisguise(player); if (disguise != null && disguise instanceof DisguiseLiving) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java index b74132e1c..f95b3faba 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java @@ -257,8 +257,6 @@ public class NextBestGameManager implements Listener return; } - Managers.get(ArcadeManager.class).getProgressionKitManager().displayKitData(event.GetPlayer()); - new BukkitRunnable() { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java index bcd7e865c..66a0dadc6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java @@ -253,7 +253,6 @@ public class ProgressingKitManager implements Listener if (!game.InProgress() || !(kit instanceof ProgressingKit)) { - player.sendMessage("No in progress"); return; } @@ -278,7 +277,6 @@ public class ProgressingKitManager implements Listener if (game.SplitKitXP || dataList == null) { - player.sendMessage("Adding data"); addData(player, game, (ProgressingKit) kit); } } @@ -286,10 +284,12 @@ public class ProgressingKitManager implements Listener @EventHandler public void onChange(GameStateChangeEvent event) { - if (event.GetState() != GameState.Dead) + // Game is over and it actually was live at some point + if (event.GetState() != GameState.Dead || event.GetGame().getGameLiveTime() == 0) { return; } + //Upon coming back into the lobby, reset player kits so they don't have to select it again _manager.getPlugin().getServer().getScheduler().runTaskLater(_manager.getPlugin(), this::resetDefaultKits, 80); //Show the data for the previous game @@ -325,7 +325,6 @@ public class ProgressingKitManager implements Listener if (dataList == null || xpGained == null) { - player.sendMessage("dataList=" + (dataList == null) + " xpGained=" + (xpGained == null)); return; }