From 493f9b7e2eed9bc2a122bc178c81f6b88853e66d Mon Sep 17 00:00:00 2001 From: lishd Date: Sat, 24 Sep 2011 00:45:29 -0400 Subject: [PATCH] Optimization and conflict resolution. --- src/lishid/openinv/OpenInv.java | 4 ++-- src/lishid/openinv/OpenInvPlayerListener.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lishid/openinv/OpenInv.java b/src/lishid/openinv/OpenInv.java index ee69660..ffa7f2a 100644 --- a/src/lishid/openinv/OpenInv.java +++ b/src/lishid/openinv/OpenInv.java @@ -48,9 +48,9 @@ public class OpenInv extends JavaPlugin { config = this.getConfiguration(); PluginManager pm = getServer().getPluginManager(); - pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Event.Priority.Highest, this); + //pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Event.Priority.Highest, this); //pm.registerEvent(Event.Type.PLAYER_RESPAWN, playerListener, Event.Priority.Normal, this); - pm.registerEvent(Event.Type.PLAYER_INTERACT, playerListener, Event.Priority.Highest, this); + pm.registerEvent(Event.Type.PLAYER_INTERACT, playerListener, Event.Priority.Monitor, this); pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Event.Priority.Lowest, this); //pm.registerEvent(Event.Type.INVENTORY_CLOSE, inventoryListener, Event.Priority.Normal, this); setupPermissions(); diff --git a/src/lishid/openinv/OpenInvPlayerListener.java b/src/lishid/openinv/OpenInvPlayerListener.java index 43e6b70..b7af59f 100644 --- a/src/lishid/openinv/OpenInvPlayerListener.java +++ b/src/lishid/openinv/OpenInvPlayerListener.java @@ -13,6 +13,7 @@ import org.bukkit.block.Chest; import org.bukkit.block.Sign; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.entity.Player; +import org.bukkit.event.Event.Result; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; @@ -40,7 +41,7 @@ public class OpenInvPlayerListener extends PlayerListener{ @Override public void onPlayerInteract(PlayerInteractEvent event) { - if(event.isCancelled()) + if(event.useInteractedBlock() == Result.DENY) return; if(event.getAction() == Action.RIGHT_CLICK_BLOCK && @@ -87,9 +88,6 @@ public class OpenInvPlayerListener extends PlayerListener{ //Send a notification event.getPlayer().sendMessage("You are opening a blocked chest."); - - //Cancel chest open event - event.setCancelled(true); } /* Chest chest = (Chest)event.getClickedBlock().getState();