EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 05:06:44 +01:00
Code Issues Projects Releases Wiki Activity

typo in disable titles

Browse Source
This commit is contained in:
Jesse Boyd 2016-04-01 06:54:28 +11:00
parent 4a7112a0a5
commit b909792d6a
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -85,20 +85,20 @@ public class Merge extends SubCommand {
} }
int direction = -1; int direction = -1;
if (args.length == 0) { if (args.length == 0) {
// switch (direction(plr.getLocationFull().getYaw())) { switch (direction(plr.getLocationFull().getYaw())) {
// case "NORTH": case "NORTH":
// direction = 0; direction = 0;
// break; break;
// case "EAST": case "EAST":
// direction = 1; direction = 1;
// break; break;
// case "SOUTH": case "SOUTH":
// direction = 2; direction = 2;
// break; break;
// case "WEST": case "WEST":
// direction = 3; direction = 3;
// break; break;
// } }
} else { } else {
if ("all".equalsIgnoreCase(args[0]) || "auto".equalsIgnoreCase(args[0])) { if ("all".equalsIgnoreCase(args[0]) || "auto".equalsIgnoreCase(args[0])) {
boolean terrain = Settings.MERGE_REMOVES_ROADS; boolean terrain = Settings.MERGE_REMOVES_ROADS;

6
Core/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java
View File

@ -67,10 +67,10 @@ public class Toggle extends Command {
description = "Toggle plot title messages") description = "Toggle plot title messages")
public void titles(Command command, PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, public void titles(Command command, PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm,
RunnableVal2<Command, CommandResult> whenDone) { RunnableVal2<Command, CommandResult> whenDone) {
if (toggle(player, "titles")) { if (toggle(player, "disabletitles")) {
MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
} else {
MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString()); MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
} else {
MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
} }
} }

4
Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -1929,6 +1929,10 @@ public class Plot {
public void setMerged(boolean[] merged) { public void setMerged(boolean[] merged) {
this.getSettings().setMerged(merged); this.getSettings().setMerged(merged);
DBFunc.setMerged(this, merged); DBFunc.setMerged(this, merged);
clearCache();
}
public void clearCache() {
connected_cache = null; connected_cache = null;
regions_cache = null; regions_cache = null;
if (this.origin != null) { if (this.origin != null) {

14
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSchematicHandler.java
View File

@ -30,6 +30,13 @@ import java.util.Set;
public class SpongeSchematicHandler extends SchematicHandler { 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 @Override
public void getCompoundTag(String world, Set<RegionWrapper> regions, RunnableVal<CompoundTag> whenDone) { public void getCompoundTag(String world, Set<RegionWrapper> regions, RunnableVal<CompoundTag> whenDone) {
// async // async
@ -295,11 +302,4 @@ 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");
}
} }