From df54dfac974e245f0f24366212731ce8d7c0eed4 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 20 Jul 2018 23:15:38 +0100 Subject: [PATCH] Fix players getting out of the Duels arena --- .../common/map/BlockRecorderComponent.java | 20 ++----------------- .../src/mineplex/hub/hubgame/duel/Duels.java | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/common/map/BlockRecorderComponent.java b/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/common/map/BlockRecorderComponent.java index df26e997b..2971171a0 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/common/map/BlockRecorderComponent.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/common/map/BlockRecorderComponent.java @@ -11,10 +11,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.player.PlayerBucketEmptyEvent; -import org.bukkit.event.player.PlayerBucketFillEvent; import mineplex.core.common.Pair; import mineplex.core.common.util.MapUtil; @@ -77,21 +74,7 @@ public class BlockRecorderComponent extends HubGameComponent _placedBlocks.add(location); event.setCancelled(false); } - - @EventHandler - public void blockPhysics(BlockPhysicsEvent event) - { - Location location = event.getBlock().getLocation(); - - if (!UtilAlg.inBoundingBox(location, _cornerA, _cornerB)) - { - return; - } - - _placedBlocks.add(event.getBlock().getLocation()); - event.setCancelled(false); - } - + @EventHandler public void end(HubGameStateChangeEvent event) { @@ -101,5 +84,6 @@ public class BlockRecorderComponent extends HubGameComponent } _game.getManager().runSyncLater(() -> _blocks.forEach((location, pair) -> MapUtil.QuickChangeBlockAt(location, pair.getLeft(), pair.getRight())), 1); + _placedBlocks.clear(); } } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/duel/Duels.java b/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/duel/Duels.java index e2d87d4ce..653e67e5f 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/duel/Duels.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/hubgame/duel/Duels.java @@ -86,7 +86,6 @@ public class Duels extends CycledGame _notDamaged = new ArrayList<>(getGameType().getMaxPlayers()); registerComponent(new DamageComponent(this)); - //registerComponent(new PVPTrackerComponent(this)); registerComponent(new GameDescriptionComponent(this, player -> { for (Player other : getAlivePlayers())