From d46475261a3bc4b034a6c08bb27a947add987e8f Mon Sep 17 00:00:00 2001 From: boy0001 Date: Wed, 12 Aug 2015 05:29:14 +1000 Subject: [PATCH] Plot border fix + remove debug --- .../plot/generator/ClassicPlotManager.java | 2 +- .../plot/generator/HybridPlotManager.java | 4 +++- src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java index 7e2c1594c..cf022f4c2 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java @@ -216,7 +216,7 @@ public abstract class ClassicPlotManager extends SquarePlotManager { final PlotId pos1 = plotIds.get(0); final PlotBlock block = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK; final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK; - if (!block.equals(unclaim)) { + if (block.id != 0 || !block.equals(unclaim)) { setWall(plotworld, pos1, new PlotBlock[] { block }); } return true; diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java index 744be69d8..bae9ec23e 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java @@ -218,7 +218,9 @@ public class HybridPlotManager extends ClassicPlotManager { public void run() { // When we are done with the inside of the plot, we can reset the wall / border final PlotBlock wall = isDelete ? dpw.WALL_BLOCK : dpw.CLAIMED_WALL_BLOCK; - setWall(dpw, plot.id, new PlotBlock[] { wall }); + if (wall.id != 0 || !dpw.WALL_BLOCK.equals(dpw.CLAIMED_WALL_BLOCK)) { + setWall(dpw, plot.id, new PlotBlock[] { wall }); + } // And notify whatever called this when plot clearing is done SetBlockQueue.addNotify(whenDone); } diff --git a/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java b/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java index 02fd1ac99..b805a2c21 100644 --- a/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java +++ b/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java @@ -85,10 +85,8 @@ public class BukkitPlayer extends PlotPlayer { return true; } if (offline && EconHandler.manager != null) { - System.out.print("CHECKIGN VAULT!"); return EconHandler.manager.hasPermission(getName(), perm); } - System.out.print("CHECKING: " + perm + " -> " + player.hasPermission(perm)); return this.player.hasPermission(perm); }