From fb70b76d291e0fc1b86149f166d03d34fcc7ebf8 Mon Sep 17 00:00:00 2001 From: Chiss Date: Sat, 15 Nov 2014 22:29:53 +1100 Subject: [PATCH] FINGERS CROSSED --- .../arcade/managers/GamePlayerManager.java | 5 ++- .../game/arcade/managers/MiscManager.java | 37 ------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java index a499bfad7..066ed62c2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java @@ -16,6 +16,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerJoinEvent; @@ -160,10 +161,10 @@ public class GamePlayerManager implements Listener if (Manager.GetGame() == null || !Manager.GetGame().InProgress()) return; - if (event.getWhoClicked().getGameMode() == GameMode.CREATIVE) + if (event.getWhoClicked().getGameMode() == GameMode.CREATIVE && event.getInventory().getType() == InventoryType.CREATIVE) { event.setCancelled(true); -// event.getWhoClicked().closeInventory(); + event.getWhoClicked().closeInventory(); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java index c378beb54..ca4065813 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java @@ -68,43 +68,6 @@ public class MiscManager implements Listener } } - @EventHandler(priority = EventPriority.LOWEST) - public void InventoryClickCancel(InventoryClickEvent event) - { - if (Manager.GetGame() == null) - return; - - Player player = UtilPlayer.searchExact(event.getWhoClicked().getName()); - if (player == null) - return; - - if (player.getGameMode() != GameMode.SURVIVAL && !player.isOp()) - { - event.setCancelled(true); -// player.closeInventory(); - } - - else if (Manager.GetGame().IsLive() && !Manager.GetGame().IsAlive(player) && !((CraftPlayer)player).getHandle().spectating) - { - event.setCancelled(true); -// player.closeInventory(); - } - } - - @EventHandler(priority = EventPriority.MONITOR) - public void InventoryClickClose(InventoryClickEvent event) - { - if (event.isCancelled()) - { - Player player = UtilPlayer.searchExact(event.getWhoClicked().getName()); - if (player == null) - return; - - if (event.getClickedInventory().getViewers().contains(player)) - player.closeInventory(); - } - } - @EventHandler public void addClockPrevent(InventoryOpenEvent event) {