Merge https://github.com/IntellectualSites/PlotSquared into 1.16

Bukkit/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     compile(project(":PlotSquared-Core"))
     compile("com.destroystokyo.paper:paper-api:1.16.2-R0.1-SNAPSHOT")
     implementation("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT")
-    compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.1.0") {
+    compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.2.0-SNAPSHOT") {
         exclude(module: "bukkit")
 
     }

Bukkit/pom.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.sk89q.worldedit</groupId>
       <artifactId>worldedit-bukkit</artifactId>
-      <version>7.1.0</version>
+      <version>7.2.0-SNAPSHOT</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>

Core/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:1.18.8")
     testAnnotationProcessor("org.projectlombok:lombok:1.18.8")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")
-    implementation("org.jetbrains:annotations:19.0.0")
+    implementation("org.jetbrains:annotations:20.0.0")
     implementation("org.khelekore:prtree:1.7.0-SNAPSHOT")
     implementation("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
     implementation("me.totalfreedom:TotalFreedomMod:2020.9")

Core/src/main/java/com/plotsquared/core/command/HomeCommand.java

@@ -84,7 +84,7 @@ public class HomeCommand extends Command {
 
     @NotNull private PlotQuery query(@NotNull final PlotPlayer<?> player) {
         // everything plots need to have in common here
-        return PlotQuery.newQuery().ownedBy(player);
+        return PlotQuery.newQuery().thatPasses(plot -> plot.isOwner(player.getUUID()));
     }
 
     @Override public CompletableFuture<Boolean> execute(PlotPlayer<?> player, String[] args,

Core/src/main/java/com/plotsquared/core/command/Visit.java

@@ -40,6 +40,7 @@ import com.plotsquared.core.util.query.PlotQuery;
 import com.plotsquared.core.util.query.SortingStrategy;
 import com.plotsquared.core.util.task.RunnableVal2;
 import com.plotsquared.core.util.task.RunnableVal3;
+import com.plotsquared.core.uuid.UUIDMapping;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -179,9 +180,9 @@ public class Visit extends Command {
                         } else if (throwable != null || uuids.size() != 1) {
                             Captions.COMMAND_SYNTAX.send(player, getUsage());
                         } else {
-                            final UUID uuid = uuids.toArray(new UUID[0])[0];
+                            final UUIDMapping mapping = uuids.toArray(new UUIDMapping[0])[0];
                             this.visit(player, PlotQuery.newQuery()
-                                    .thatPasses(plot -> plot.isOwner(uuid)),
+                                    .thatPasses(plot -> plot.isOwner(mapping.getUuid())),
                                     finalSortByArea, confirm, whenDone, finalPage1);
                         }
                     });

Core/src/main/java/com/plotsquared/core/configuration/Captions.java

@@ -627,7 +627,7 @@ public enum Captions implements Caption {
     FLAG_DESCRIPTION_ANIMAL_CAP("Set to an integer value to limit the amount of animals on the plot.", "Flags"),
     FLAG_DESCRIPTION_ANIMAL_INTERACT("Set to `true` to allow animals to be interacted with in the plot.", "Flags"),
     FLAG_DESCRIPTION_BLOCK_BURN("Set to `true` to allow blocks to burn within the plot.", "Flags"),
-    FLAG_DESCRIPTION_BLOCK_IGNITION("Set to `false` to prevent blocks from igniting within the plot.", "Flags"),
+    FLAG_DESCRIPTION_BLOCK_IGNITION("Set to `true` to allow blocks getting ignited within the plot.", "Flags"),
     FLAG_DESCRIPTION_BREAK("Define a list of materials players should be able to break even when they aren't added to the plot.", "Flags"),
     FLAG_DESCRIPTION_DEVICE_INTERACT("Set to `true` to allow devices to be interacted with in the plot.", "Flags"),
     FLAG_DESCRIPTION_DISABLE_PHYSICS("Set to `true` to disable block physics in the plot.", "Flags"),

Core/src/main/java/com/plotsquared/core/plot/PlotArea.java

@@ -1064,7 +1064,7 @@ public abstract class PlotArea {
      * @return true if plot signs are allow, false otherwise.
      */
     public boolean allowSigns() {
-        return allowSigns && (this.plots.size() > 1) /* Do not generate signs for single plots */;
+        return allowSigns;
     }
 
     /**

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -143,7 +143,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(AnimalAttackFlag.ANIMAL_ATTACK_FALSE);
         this.addFlag(AnimalInteractFlag.ANIMAL_INTERACT_FALSE);
         this.addFlag(BlockBurnFlag.BLOCK_BURN_FALSE);
-        this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
+        this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_FALSE);
         this.addFlag(DeviceInteractFlag.DEVICE_INTERACT_FALSE);
         this.addFlag(DisablePhysicsFlag.DISABLE_PHYSICS_FALSE);
         this.addFlag(DropProtectionFlag.DROP_PROTECTION_FALSE);

Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java

@@ -191,6 +191,11 @@ public class SinglePlotArea extends GridPlotWorld {
         return super.addPlotIfAbsent(plot);
     }
 
+    @Override
+    public boolean allowSigns() {
+        return false; // do not create signs for single plots
+    }
+
     protected Plot adapt(Plot p) {
         if (p instanceof SinglePlot) {
             return p;

build.gradle

@@ -18,7 +18,7 @@ buildscript {
     configurations.all {
         resolutionStrategy {
             force("org.ow2.asm:asm:8.0.1")
-            force("org.jetbrains:annotations:19.0.0")
+            force("org.jetbrains:annotations:20.0.0")
         }
     }
 }
@@ -34,7 +34,7 @@ ext {
     git = Grgit.open(dir: new File(rootDir.toString() + "/.git"))
 }
 
-def ver = "5.13.2"
+def ver = "5.13.3"
 def versuffix = ""
 ext {
     if (project.hasProperty("versionsuffix")) {
@@ -98,7 +98,7 @@ subprojects {
         resolutionStrategy {
             force("junit:junit:4.12")
             force("com.google.guava:guava:21.0")
-            force("org.jetbrains:annotations:19.0.0")
+            force("org.jetbrains:annotations:20.0.0")
             force("com.google.code.findbugs:jsr305:3.0.2")
         }
     }