Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java

@@ -19,7 +19,7 @@ import java.util.UUID;
 @CommandDeclaration(command = "add",
     description = "Allow a user to build in a plot while you are online",
     usage = "/plot add <player>", category = CommandCategory.SETTINGS, permission = "plots.add",
-    requiredType = RequiredType.NONE) public class Add extends Command {
+    requiredType = RequiredType.PLAYER) public class Add extends Command {
 
     public Add() {
         super(MainCommand.getInstance(), true);
@@ -63,21 +63,19 @@ import java.util.UUID;
         checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
                 .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
             Captions.PLOT_MAX_MEMBERS);
-        confirm.run(this, new Runnable() {
+        // Success
-            @Override // Success
+        confirm.run(this, () -> {
-            public void run() {
+            for (UUID uuid : uuids) {
-                for (UUID uuid : uuids) {
+                if (uuid != DBFunc.EVERYONE) {
-                    if (uuid != DBFunc.EVERYONE) {
+                    if (!plot.removeTrusted(uuid)) {
-                        if (!plot.removeTrusted(uuid)) {
+                        if (plot.getDenied().contains(uuid)) {
-                            if (plot.getDenied().contains(uuid)) {
+                            plot.removeDenied(uuid);
-                                plot.removeDenied(uuid);
-                            }
                         }
                     }
-                    plot.addMember(uuid);
-                    EventUtil.manager.callMember(player, plot, uuid, true);
-                    MainUtil.sendMessage(player, Captions.MEMBER_ADDED);
                 }
+                plot.addMember(uuid);
+                EventUtil.manager.callMember(player, plot, uuid, true);
+                MainUtil.sendMessage(player, Captions.MEMBER_ADDED);
             }
         }, null);
     }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java

@@ -25,8 +25,12 @@ public class Auto extends SubCommand {
         if (allowedPlots == null) {
             allowedPlots = player.getAllowedPlots();
         }
-        int currentPlots =
+        int currentPlots;
-            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plotarea.worldname);
+        if (Settings.Limit.GLOBAL) {
+            currentPlots = player.getPlotCount();
+        } else {
+            currentPlots = player.getPlotCount(plotarea.worldname);
+        }
         int diff = currentPlots - allowedPlots;
         if (diff + sizeX * sizeZ > 0) {
             if (diff < 0) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java

@@ -27,11 +27,9 @@ import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
             return false;
         }
         plot.addRunning();
-        plot.setBiome(value.toUpperCase(), new Runnable() {
+        plot.setBiome(value.toUpperCase(), () -> {
-            @Override public void run() {
+            plot.removeRunning();
-                plot.removeRunning();
+            MainUtil.sendMessage(player, Captions.BIOME_SET_TO.s() + value.toLowerCase());
-                MainUtil.sendMessage(player, Captions.BIOME_SET_TO.s() + value.toLowerCase());
-            }
         });
         return true;
     }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java

@@ -126,13 +126,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
                             }
                             i++;
                             final AtomicBoolean result = new AtomicBoolean(false);
-                            result.set(origin.move(possible, new Runnable() {
+                            result.set(origin.move(possible, () -> {
-                                @Override public void run() {
+                                if (result.get()) {
-                                    if (result.get()) {
+                                    MainUtil.sendMessage(player,
-                                        MainUtil.sendMessage(player,
+                                        "Moving: " + origin + " -> " + possible);
-                                            "Moving: " + origin + " -> " + possible);
+                                    TaskManager.runTaskLater(task, 1);
-                                        TaskManager.runTaskLater(task, 1);
-                                    }
                                 }
                             }, false));
                             if (result.get()) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java

@@ -16,7 +16,7 @@ import java.util.UUID;
 
 @CommandDeclaration(command = "deny", aliases = {"d", "ban"},
     description = "Deny a user from a plot", usage = "/plot deny <player>",
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Deny
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER) public class Deny
     extends SubCommand {
 
     public Deny() {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java

@@ -38,8 +38,12 @@ import java.util.UUID;
                 if (args.length > 2) {
                     break;
                 }
-                final UUID uuid =
+                final UUID uuid;
-                    args.length == 2 ? UUIDHandler.getUUIDFromString(args[1]) : player.getUUID();
+                if (args.length == 2) {
+                    uuid = UUIDHandler.getUUIDFromString(args[1]);
+                } else {
+                    uuid = player.getUUID();
+                }
                 if (uuid == null) {
                     Captions.INVALID_PLAYER.send(player, args[1]);
                     return;
@@ -47,12 +51,20 @@ import java.util.UUID;
                 MainUtil.getPersistentMeta(uuid, "grantedPlots", new RunnableVal<byte[]>() {
                     @Override public void run(byte[] array) {
                         if (arg0.equals("check")) { // check
-                            int granted =
+                            int granted;
-                                array == null ? 0 : ByteArrayUtilities.bytesToInteger(array);
+                            if (array == null) {
+                                granted = 0;
+                            } else {
+                                granted = ByteArrayUtilities.bytesToInteger(array);
+                            }
                             Captions.GRANTED_PLOTS.send(player, granted);
                         } else { // add
-                            int amount =
+                            int amount;
-                                1 + (array == null ? 0 : ByteArrayUtilities.bytesToInteger(array));
+                            if (array == null) {
+                                amount = 1;
+                            } else {
+                                amount = 1 + ByteArrayUtilities.bytesToInteger(array);
+                            }
                             boolean replace = array != null;
                             String key = "grantedPlots";
                             byte[] rawData = ByteArrayUtilities.integerToBytes(amount);

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 @CommandDeclaration(command = "inbox", description = "Review the comments for a plot",
     usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox",
-    category = CommandCategory.CHAT, requiredType = RequiredType.NONE) public class Inbox
+    category = CommandCategory.CHAT, requiredType = RequiredType.PLAYER) public class Inbox
     extends SubCommand {
 
     public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
@@ -23,7 +23,7 @@ import java.util.List;
             MainUtil.sendMessage(player, Captions.INBOX_EMPTY);
             return;
         }
-        PlotComment[] comments = oldComments.toArray(new PlotComment[oldComments.size()]);
+        PlotComment[] comments = oldComments.toArray(new PlotComment[0]);
         if (page < 0) {
             page = 0;
         }

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java

@@ -130,9 +130,15 @@ import java.util.UUID;
         if (arg != null) {
             info = getCaption(arg);
             if (info == null) {
-                MainUtil.sendMessage(player,
+                if (Settings.Ratings.USE_LIKES) {
-                    "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                    MainUtil.sendMessage(player,
-                        + "&aowner&7, " + (Settings.Ratings.USE_LIKES ? " &alikes" : " &arating"));
+                        "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                            + "&aowner&7, " + " &alikes");
+                } else {
+                    MainUtil.sendMessage(player,
+                        "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                            + "&aowner&7, " + " &arating");
+                }
                 return false;
             }
             full = true;

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java

@@ -19,7 +19,7 @@ import java.util.UUID;
 
 @CommandDeclaration(command = "kick", aliases = {"k"}, description = "Kick a player from your plot",
     permission = "plots.kick", usage = "/plot kick <player>", category = CommandCategory.TELEPORT,
-    requiredType = RequiredType.NONE) public class Kick extends SubCommand {
+    requiredType = RequiredType.PLAYER) public class Kick extends SubCommand {
 
     public Kick() {
         super(Argument.PlayerName);

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java

@@ -96,8 +96,11 @@ public class Like extends SubCommand {
             final Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
             if (result != null) {
                 plot.addRating(uuid, result);
-                sendMessage(player, like ? Captions.RATING_LIKED : Captions.RATING_DISLIKED,
+                if (like) {
-                    plot.getId().toString());
+                    sendMessage(player, Captions.RATING_LIKED, plot.getId().toString());
+                } else {
+                    sendMessage(player, Captions.RATING_DISLIKED, plot.getId().toString());
+                }
             }
         };
         if (plot.getSettings().ratings == null) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java

@@ -9,7 +9,7 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 
 @CommandDeclaration(usage = "/plot swap <X;Z>", command = "swap", description = "Swap two plots",
-    aliases = {"switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE)
+    aliases = {"switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.PLAYER)
 public class Swap extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {

Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java

@@ -7,8 +7,8 @@ import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
-@CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"},
+@CommandDeclaration(command = "unlink", aliases = {"u",
-    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]", requiredType = RequiredType.PLAYER, category = CommandCategory.SETTINGS, confirmation = true)
+    "unmerge"}, description = "Unlink a mega-plot", usage = "/plot unlink [createroads]", requiredType = RequiredType.PLAYER, category = CommandCategory.SETTINGS, confirmation = true)
 public class Unlink extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
@@ -38,14 +38,12 @@ public class Unlink extends SubCommand {
         } else {
             createRoad = true;
         }
-        Runnable runnable = new Runnable() {
+        Runnable runnable = () -> {
-            @Override public void run() {
+            if (!plot.unlinkPlot(createRoad, createRoad)) {
-                if (!plot.unlinkPlot(createRoad, createRoad)) {
+                MainUtil.sendMessage(player, "&cUnlink has been cancelled");
-                    MainUtil.sendMessage(player, "&cUnlink has been cancelled");
+                return;
-                    return;
-                }
-                MainUtil.sendMessage(player, Captions.UNLINK_SUCCESS);
             }
+            MainUtil.sendMessage(player, Captions.UNLINK_SUCCESS);
         };
         if (hasConfirmation(player)) {
             CmdConfirm.addPending(player, "/plot unlink " + plot.getId(), runnable);