From 05e85523b138c1e4a13cc92a7923899d4ddf4b61 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 4 Jun 2016 17:42:30 +0100 Subject: [PATCH] PC-405 Fixes an issue where players would be able to fill buckets of water in Bridges and get to the centre before the Bridges has fallen. --- .../game/arcade/game/games/bridge/Bridge.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java index 7e3697936..ccd665269 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java @@ -21,6 +21,7 @@ import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.ore.OreHider; import nautilus.game.arcade.ore.OreObsfucation; import nautilus.game.arcade.stats.*; + import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -43,6 +44,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.PrepareItemCraftEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent; +import org.bukkit.event.player.PlayerBucketFillEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerPickupItemEvent; @@ -1926,6 +1928,15 @@ public class Bridge extends TeamGame implements OreObsfucation { event.setCancelled(true); } + + @EventHandler + public void disableWaterPickup(PlayerBucketFillEvent event) + { + if(_bridgesDown) + return; + UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot pickup liquids before the bridges have fallen.")); + event.setCancelled(true); + } public void setBridgeTime(int time) {