From 625d19b5d09f56ffe88288ea03e35200d295381c Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Mon, 23 Feb 2015 11:58:47 +1100
Subject: [PATCH] Fixed plot deletion and unable to locate sign messages

---
 .../java/com/intellectualcrafters/plot/PlotSquared.java     | 6 +-----
 .../java/com/intellectualcrafters/plot/commands/Claim.java  | 3 +--
 .../java/com/intellectualcrafters/plot/commands/Delete.java | 2 +-
 .../plot/util/bukkit/SetBlockFast_1_8.java                  | 3 +++
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
index 19e63bdec..9af49c7bc 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
@@ -204,11 +204,7 @@ public class PlotSquared {
     }
     
     public static boolean removePlot(final String world, final PlotId id, final boolean callEvent) {
-        if (callEvent) {
-            if (!IMP.callRemovePlot(world, id)) {
-                return false;
-            }
-        }
+        // FIXME plot remove event
         plots.get(world).remove(id);
         if (MainUtil.lastPlot.containsKey(world)) {
             final PlotId last = MainUtil.lastPlot.get(world);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
index c0b590cc3..b6a7234f4 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
@@ -106,7 +106,6 @@ public class Claim extends SubCommand {
         if (PlotSquared.economy != null && world.USE_ECONOMY) {
             final double cost = world.PLOT_PRICE;
             if (cost > 0d) {
-                final Economy economy = PlotSquared.economy;
                 if (EconHandler.getBalance(plr) < cost) {
                     return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + cost);
                 }
@@ -124,6 +123,6 @@ public class Claim extends SubCommand {
                 }
             }
         }
-        return !claimPlot(plr, plot, false, schematic, false) || sendMessage(plr, C.PLOT_NOT_CLAIMED);
+        return claimPlot(plr, plot, false, schematic, false) || sendMessage(plr, C.PLOT_NOT_CLAIMED);
     }
 }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
index ae5772426..2e5303972 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
@@ -66,7 +66,7 @@ public class Delete extends SubCommand {
         final boolean result = PlotSquared.removePlot(loc.getWorld(), plot.id, true);
         final long start = System.currentTimeMillis();
         if (result) {
-            boolean result2 = MainUtil.clearAsPlayer(plot, false, new Runnable() {
+            boolean result2 = MainUtil.clearAsPlayer(plot, true, new Runnable() {
                 @Override
                 public void run() {
                     MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java
index 6f649df01..65bd2eea8 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java
@@ -83,6 +83,9 @@ public class SetBlockFast_1_8 extends SetBlockManager {
             case 130:
             case 146:
             case 27:
+            case 63:
+            case 68:
+            case 313:
             case 28:
             case 66:
             case 157: