EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-28 19:54:43 +02:00
Code Issues Projects Releases Wiki Activity

Here you go.

Browse Source
This commit is contained in:
boy0001
2015-09-03 22:40:36 +10:00
parent dfc32741fa
commit 4e321d2b27
9 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,6 +111,11 @@ public class Merge extends SubCommand {
}
}
else {
if (args[0].equalsIgnoreCase("all")) {
plot.autoMerge(args.length != 2 || !args[1].equalsIgnoreCase("false"));
MainUtil.sendMessage(plr, C.SUCCESS_MERGE);
return true;
}
for (int i = 0; i < values.length; i++) {
if (args[0].equalsIgnoreCase(values[i]) || args[0].equalsIgnoreCase(aliases[i])) {
direction = i;

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

@ -56,11 +56,10 @@ public class Unlink extends SubCommand {
if (MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
return sendMessage(plr, C.UNLINK_IMPOSSIBLE);
}
Runnable runnable = new Runnable() {
@Override
public void run() {
if (!MainUtil.unlinkPlot(plot)) {
if (!MainUtil.unlinkPlot(plot, true)) {
MainUtil.sendMessage(plr, "&cUnlink has been cancelled");
return;
}