From 9a914929d1c04c6395dde26f0e8f67f1222e62ce Mon Sep 17 00:00:00 2001
From: Acrobot <andrzejp@dysleksja.pl>
Date: Fri, 9 Sep 2011 15:15:53 +0200
Subject: [PATCH] - Fixed a bug with admin placed signs

---
 com/Acrobot/ChestShop/ChestShop.java            | 1 +
 com/Acrobot/ChestShop/Listeners/blockBreak.java | 6 +++---
 com/Acrobot/ChestShop/Utils/uBlock.java         | 2 +-
 plugin.yml                                      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/com/Acrobot/ChestShop/ChestShop.java b/com/Acrobot/ChestShop/ChestShop.java
index d9a6758..d80088a 100644
--- a/com/Acrobot/ChestShop/ChestShop.java
+++ b/com/Acrobot/ChestShop/ChestShop.java
@@ -13,6 +13,7 @@ import com.Acrobot.ChestShop.Logging.FileWriterQueue;
 import com.Acrobot.ChestShop.Protection.MaskChest;
 import com.avaje.ebean.EbeanServer;
 import com.lennardf1989.bukkitex.Database;
+import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
diff --git a/com/Acrobot/ChestShop/Listeners/blockBreak.java b/com/Acrobot/ChestShop/Listeners/blockBreak.java
index 12554b4..ec82925 100644
--- a/com/Acrobot/ChestShop/Listeners/blockBreak.java
+++ b/com/Acrobot/ChestShop/Listeners/blockBreak.java
@@ -22,10 +22,10 @@ public class blockBreak extends BlockListener {
         if (uSign.isSign(block)) block.getState().update();
 
         Sign sign = uBlock.findRestrictedSign(block);
-        if (sign != null && isCorrectSign(sign, block)) return true;
+        if (isCorrectSign(sign, block)) return true;
 
         sign = uBlock.findSign(block);
-        return sign != null && (isCorrectSign(sign, block) && playerIsNotOwner(player, sign));
+        return isCorrectSign(sign, block) && playerIsNotOwner(player, sign);
     }
 
     public void onBlockBreak(BlockBreakEvent event) {
@@ -33,7 +33,7 @@ public class blockBreak extends BlockListener {
     }
 
     private static boolean isCorrectSign(Sign sign, Block block) {
-        return sign.getBlock() == block || getAttachedFace(sign) == block;
+        return sign != null && sign.getBlock() == block || getAttachedFace(sign) == block;
     }
 
     private static Block getAttachedFace(Sign sign) {
diff --git a/com/Acrobot/ChestShop/Utils/uBlock.java b/com/Acrobot/ChestShop/Utils/uBlock.java
index e9ea3cc..4bfd9aa 100644
--- a/com/Acrobot/ChestShop/Utils/uBlock.java
+++ b/com/Acrobot/ChestShop/Utils/uBlock.java
@@ -13,7 +13,7 @@ import org.bukkit.block.Sign;
 public class uBlock {
 
     private static final BlockFace[] chestFaces = {BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH};
-    private static final BlockFace[] shopFaces = {BlockFace.DOWN, BlockFace.UP, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH, BlockFace.SELF};
+    private static final BlockFace[] shopFaces = {BlockFace.SELF, BlockFace.DOWN, BlockFace.UP, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH};
 
     public static Chest findChest(Sign sign) {
         Block block = sign.getBlock();
diff --git a/plugin.yml b/plugin.yml
index 5292a4e..a4b22a0 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -2,7 +2,7 @@ name: ChestShop
 
 main: com.Acrobot.ChestShop.ChestShop
 
-version: 3.1
+version: 3.11
 
 
 author: Acrobot