From 2fca493dec764ebd7d96b38e8276bb4701f20195 Mon Sep 17 00:00:00 2001
From: Acrobot <andrzejp@dysleksja.pl>
Date: Mon, 31 Dec 2012 02:34:16 +0100
Subject: [PATCH] Refractored player interact a bit

---
 .../Listeners/Player/PlayerInteract.java      | 65 ++-----------------
 1 file changed, 4 insertions(+), 61 deletions(-)

diff --git a/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java b/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
index d45a71e..5238c3d 100644
--- a/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
+++ b/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
@@ -30,9 +30,9 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
+import static com.Acrobot.Breeze.Utils.BlockUtil.*;
 import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType;
-import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.BUY;
-import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.SELL;
+import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.*;
 import static com.Acrobot.ChestShop.Signs.ChestShopSign.*;
 import static org.bukkit.event.block.Action.LEFT_CLICK_BLOCK;
 import static org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK;
@@ -42,7 +42,7 @@ import static org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK;
  */
 public class PlayerInteract implements Listener {
 
-    /*@EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public static void onInteract(PlayerInteractEvent event) {
         Block block = event.getClickedBlock();
 
@@ -100,63 +100,6 @@ public class PlayerInteract implements Listener {
             return;
         }
 
-        TransactionEvent tEvent = new TransactionEvent(pEvent, sign);
-        Bukkit.getPluginManager().callEvent(tEvent);
-    }*/
-
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public static void onPlayerInteract(PlayerInteractEvent event) {
-        Block clickedBlock = event.getClickedBlock();
-
-        if (clickedBlock == null) {
-            return;
-        }
-
-        Action action = event.getAction();
-        Player player = event.getPlayer();
-
-        if (Properties.USE_BUILT_IN_PROTECTION && clickedBlock.getType() == Material.CHEST) {
-            if (Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) {
-                return;
-            }
-
-            if (!canOpenOtherShops(player) && !ChestShop.canAccess(player, clickedBlock)) {
-                player.sendMessage(Messages.prefix(Messages.ACCESS_DENIED));
-                event.setCancelled(true);
-            }
-
-            return; //The else doesn't matter, because the clicked block is a chest
-        }
-
-        if (!BlockUtil.isSign(clickedBlock)) return;
-        Sign sign = (Sign) clickedBlock.getState();
-
-        if (player.getItemInHand() != null && player.getItemInHand().getType() == Material.SIGN) return;
-        if (!ChestShopSign.isValid(sign) || (ChestShopSign.canAccess(player, sign) && player.isSneaking())) return;
-
-        if (action == RIGHT_CLICK_BLOCK) {
-            event.setCancelled(true);
-        }
-
-        if (ChestShopSign.canAccess(player, sign)) {
-            if (!Properties.ALLOW_SIGN_CHEST_OPEN) {
-                return;
-            }
-
-            if (action != LEFT_CLICK_BLOCK || !Properties.ALLOW_LEFT_CLICK_DESTROYING) {
-                showChestGUI(player, clickedBlock);
-            }
-            return;
-        }
-
-        PreTransactionEvent pEvent = preparePreTransactionEvent(sign, player, action);
-        Bukkit.getPluginManager().callEvent(pEvent);
-
-        if (pEvent.isCancelled()) {
-            return;
-        }
-
         TransactionEvent tEvent = new TransactionEvent(pEvent, sign);
         Bukkit.getPluginManager().callEvent(tEvent);
     }
@@ -223,6 +166,6 @@ public class PlayerInteract implements Listener {
             return;
         }
 
-        BlockUtil.openBlockGUI(chest.getBlock(), player);
+        BlockUtil.openBlockGUI(chest, player);
     }
 }