Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-06 09:33:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Plot border fix + remove debug

Browse Source
This commit is contained in:
boy0001 2015-08-12 05:29:14 +10:00
parent 7d3de207aa
commit d46475261a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
View File

@ -216,7 +216,7 @@ public abstract class ClassicPlotManager extends SquarePlotManager {
final PlotId pos1 = plotIds.get(0); final PlotId pos1 = plotIds.get(0);
final PlotBlock block = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK; final PlotBlock block = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK;
final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).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 }); setWall(plotworld, pos1, new PlotBlock[] { block });
} }
return true; return true;

2
src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java
View File

@ -218,7 +218,9 @@ public class HybridPlotManager extends ClassicPlotManager {
public void run() { public void run() {
// When we are done with the inside of the plot, we can reset the wall / border // 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; final PlotBlock wall = isDelete ? dpw.WALL_BLOCK : dpw.CLAIMED_WALL_BLOCK;
if (wall.id != 0 || !dpw.WALL_BLOCK.equals(dpw.CLAIMED_WALL_BLOCK)) {
setWall(dpw, plot.id, new PlotBlock[] { wall }); setWall(dpw, plot.id, new PlotBlock[] { wall });
}
// And notify whatever called this when plot clearing is done // And notify whatever called this when plot clearing is done
SetBlockQueue.addNotify(whenDone); SetBlockQueue.addNotify(whenDone);
} }

2
src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
View File

@ -85,10 +85,8 @@ public class BukkitPlayer extends PlotPlayer {
return true; return true;
} }
if (offline && EconHandler.manager != null) { if (offline && EconHandler.manager != null) {
System.out.print("CHECKIGN VAULT!");
return EconHandler.manager.hasPermission(getName(), perm); return EconHandler.manager.hasPermission(getName(), perm);
} }
System.out.print("CHECKING: " + perm + " -> " + player.hasPermission(perm));
return this.player.hasPermission(perm); return this.player.hasPermission(perm);
} }