EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-31 01:23:44 +01:00
Code Issues Projects Releases Wiki Activity

Fixed plot deletion and unable to locate sign messages

Browse Source
This commit is contained in:
boy0001
2015-02-23 11:58:47 +11:00
parent 9b20e096f0
commit 625d19b5d0
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
View File

@@ -204,11 +204,7 @@ public class PlotSquared {
} }
public static boolean removePlot(final String world, final PlotId id, final boolean callEvent) { public static boolean removePlot(final String world, final PlotId id, final boolean callEvent) {
if (callEvent) { // FIXME plot remove event
if (!IMP.callRemovePlot(world, id)) {
return false;
}
}
plots.get(world).remove(id); plots.get(world).remove(id);
if (MainUtil.lastPlot.containsKey(world)) { if (MainUtil.lastPlot.containsKey(world)) {
final PlotId last = MainUtil.lastPlot.get(world); final PlotId last = MainUtil.lastPlot.get(world);

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
View File

@@ -106,7 +106,6 @@ public class Claim extends SubCommand {
if (PlotSquared.economy != null && world.USE_ECONOMY) { if (PlotSquared.economy != null && world.USE_ECONOMY) {
final double cost = world.PLOT_PRICE; final double cost = world.PLOT_PRICE;
if (cost > 0d) { if (cost > 0d) {
final Economy economy = PlotSquared.economy;
if (EconHandler.getBalance(plr) < cost) { if (EconHandler.getBalance(plr) < cost) {
return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + 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);
} }
} }

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
View File

@@ -66,7 +66,7 @@ public class Delete extends SubCommand {
final boolean result = PlotSquared.removePlot(loc.getWorld(), plot.id, true); final boolean result = PlotSquared.removePlot(loc.getWorld(), plot.id, true);
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
if (result) { if (result) {
boolean result2 = MainUtil.clearAsPlayer(plot, false, new Runnable() { boolean result2 = MainUtil.clearAsPlayer(plot, true, new Runnable() {
@Override @Override
public void run() { public void run() {
MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start)); MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetBlockFast_1_8.java
View File

@@ -83,6 +83,9 @@ public class SetBlockFast_1_8 extends SetBlockManager {
case 130: case 130:
case 146: case 146:
case 27: case 27:
case 63:
case 68:
case 313:
case 28: case 28:
case 66: case 66:
case 157: case 157: