EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02: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
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;
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;

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")
public void titles(Command command, PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm,
RunnableVal2<Command, CommandResult> 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());
}
}

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) {
this.getSettings().setMerged(merged);
DBFunc.setMerged(this, merged);
clearCache();
}
public void clearCache() {
connected_cache = null;
regions_cache = null;
if (this.origin != null) {