diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java index 19b462c92..ed6215494 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java @@ -85,20 +85,20 @@ public class Merge extends SubCommand { } int direction = -1; if (args.length == 0) { - // switch (direction(plr.getLocationFull().getYaw())) { - // case "NORTH": - // direction = 0; - // break; - // case "EAST": - // direction = 1; - // break; - // case "SOUTH": - // direction = 2; - // break; - // case "WEST": - // direction = 3; - // break; - // } + switch (direction(plr.getLocationFull().getYaw())) { + case "NORTH": + direction = 0; + break; + case "EAST": + direction = 1; + break; + case "SOUTH": + direction = 2; + break; + case "WEST": + direction = 3; + break; + } } else { if ("all".equalsIgnoreCase(args[0]) || "auto".equalsIgnoreCase(args[0])) { boolean terrain = Settings.MERGE_REMOVES_ROADS; diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java index 7cb76536c..536f82c63 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java @@ -67,10 +67,10 @@ public class Toggle extends Command { description = "Toggle plot title messages") public void titles(Command command, PlotPlayer player, String[] args, RunnableVal3 confirm, RunnableVal2 whenDone) { - if (toggle(player, "titles")) { - MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString()); - } else { + if (toggle(player, "disabletitles")) { MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString()); + } else { + MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString()); } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java index 950090c66..7a775fa45 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java @@ -1929,6 +1929,10 @@ public class Plot { public void setMerged(boolean[] merged) { this.getSettings().setMerged(merged); DBFunc.setMerged(this, merged); + clearCache(); + } + + public void clearCache() { connected_cache = null; regions_cache = null; if (this.origin != null) { diff --git a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java index 7663e4699..e23f40d56 100644 --- a/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java +++ b/Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java @@ -29,7 +29,14 @@ import java.util.Map.Entry; import java.util.Set; public class SpongeSchematicHandler extends SchematicHandler { - + + @Override + public void restoreTile(String world, CompoundTag tag, int x, int y, int z) { + // TODO Auto-generated method stub + // This method should place the compound tag at a location e.g. chest contents + throw new UnsupportedOperationException("NOT IMPLEMENTED YET"); + } + @Override public void getCompoundTag(String world, Set regions, RunnableVal whenDone) { // async @@ -294,12 +301,5 @@ public class SpongeSchematicHandler extends SchematicHandler { } }); } - - @Override - public void restoreTag(CompoundTag ct, short x, short y, short z, Schematic schematic) { - // TODO Auto-generated method stub - // This method should place the compound tag at a location e.g. chest contents - throw new UnsupportedOperationException("NOT IMPLEMENTED YET"); - } - + }