Beta 2

Author: EricRabil

src/main/java/info/tregmine/listeners/ZonePlayerListener.java

@@ -165,52 +165,51 @@ private void movePlayerBack(GenericPlayer player, Location movingFrom, Location
 
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
+        if (event.getPlayer().getItemOnCursor().getType() == Material.STICK) return;
         GenericPlayer player = plugin.getPlayer(event.getPlayer());
         if (player == null) {
             return;
         }
         ItemStack item = player.getItemInHand();
-        if (item.getType() == Material.STICK) {
-            event.setCancelled(true);
+        event.setCancelled(true);
 
-            Block block = event.getBlock();
-            Point currentPos = new Point(block.getX(), block.getZ());
-            ZoneWorld world = plugin.getWorld(block.getWorld());
-            Zone zone = world.findZone(currentPos);
-            Lot lot = world.findLot(currentPos);
-            // within a zone, lots can be created by zone owners or people with
-            // the zones permission.
-            String type = null;
-            if (zone != null) {
-                Zone.Permission perm = zone.getUser(player);
-                if (perm != Zone.Permission.Owner && !player.getRank().canModifyZones()) {
+        Block block = event.getBlock();
+        Point currentPos = new Point(block.getX(), block.getZ());
+        ZoneWorld world = plugin.getWorld(block.getWorld());
+        Zone zone = world.findZone(currentPos);
+        Lot lot = world.findLot(currentPos);
+        // within a zone, lots can be created by zone owners or people with
+        // the zones permission.
+        String type = null;
+        if (zone != null) {
+            Zone.Permission perm = zone.getUser(player);
+            if (perm != Zone.Permission.Owner && !player.getRank().canModifyZones()) {
 
-                    return;
-                }
-                if (lot != null) {
-                    player.sendMessage("This lot is called " + lot.getName() + ".");
-                    return;
-                }
-                type = "lot";
+                return;
             }
-            // outside of a zone
-            else {
-                // outside of any existing zone, this can only be used by people
-                // with zones permission.
-                if (!player.getRank().canModifyZones()) {
-                    return;
-                }
-                type = "zone";
+            if (lot != null) {
+                player.sendMessage("This lot is called " + lot.getName() + ".");
+                return;
             }
-            if (player.getZoneBlock1().getLocation().distance(block.getLocation()) == 0)
+            type = "lot";
+        }
+        // outside of a zone
+        else {
+            // outside of any existing zone, this can only be used by people
+            // with zones permission.
+            if (!player.getRank().canModifyZones()) {
                 return;
-            player.setZoneBlock1(block);
-            event.getPlayer().sendMessage("First block set of new " + type + ".");
-            if (zone != null) {
-                player.setTargetZoneId(zone.getId());
-            } else {
-                player.setTargetZoneId(0);
             }
+            type = "zone";
+        }
+        if (player.getZoneBlock1() != null && player.getZoneBlock1().getLocation().distance(block.getLocation()) == 0)
+            return;
+        player.setZoneBlock1(block);
+        event.getPlayer().sendMessage("First block set of new " + type + ".");
+        if (zone != null) {
+            player.setTargetZoneId(zone.getId());
+        } else {
+            player.setTargetZoneId(0);
         }
     }
 

src/main/java/plugin.yml

@@ -1,6 +1,6 @@
 name: tregmine
 main: info.tregmine.Tregmine
-version: 1.1.4-Beta1
+version: 1.1.4-Beta2
 website: https://www.tregmine.com
 author: Ein Andersson, Emil Hernvall, Eric Rabil, Josh Morgan, James Sherlock, Rob Catron, Joe Notaro
 description: Tregmine Plugin