Merge v5 into v6

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @IntellectualSites/plotsquared-team

.github/ISSUE_TEMPLATE.md

@@ -1,101 +0,0 @@
----
-name: Bug/Issue report for PlotSquared
-about: Bug / Issue report about this plugin
-title: ''
-labels: "[?] Testing Required"
-assignees: ''
-
----
-
-<!--- READ THIS BEFORE SUBMITTING AN ISSUE REPORT!!! -->
-
-<!--- ##### DO NOT REMOVE THIS TEMPLATE!  YOUR ISSUE *WILL* FIT IN IT! ##### -->
-
-<!--- # NOTICE: 
-
-**Feature requests & Suggestions are to be submitted at the [PlotSquared Suggestions tracker](https://github.com/IntellectualSites/PlotSquaredSuggestions)**
-
-**Code contributions are to be done through [PRs](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request), tagging the specific issue ticket(s) if applicable.**
-
-**[DISCORD INVITE LINK](https://discord.gg/KxkjDVg)**
--->
-
-# Bug Report Template:
-<!--- Incomplete reports will most likely be marked as invalid, and closed, with few exceptions.-->
-## Required Information section:
-> ALL FIELDS  IN THIS SECTION ARE REQUIRED, and must contain appropriate information
-### Server config info (/plot debugpaste / file paste links):
-<!--- Issue /plot debugpaste in game or in your console and copy the supplied URL here -->
-<!--- If you cannot perform the above, we require logs/latest.log; settings.yml; worlds.yml and possibly PlotSquared.use_THIS.yml -->
-<!--- If you are unwilling to supply the information we need, we reserve the right to not assist you. Redact IP addresses if you need to. -->
-**/plot debugpaste:** 
-
-### Server type:
-**Select one**
-<!-- Select the type you are reporting the issue for (put an "X" between of brackets): -->
-- [] Spigot / Paper *(CraftBukkit should not be used, re-test with Spigot first!)*
-- [] Sponge
-- [] NukkitX
-
-### PlotSquared version:
-<!-- Run /plot plugin in-game or in console & paste the full output here: -->
-```
-Paste the output here, between the tick marks, replacing this text
-```
-
-### Minecraft Version:
-**Select one**
-<!-- Select the type you are reporting the issue for (put an "X" between of brackets) -->
-- [] Minecraft 1.15.2
-- [] Minecraft 1.14.4
-- [] Minecraft 1.13.2
-- [] Minecraft 1.12.2
-- [] Minecraft 1.11.2
-- [] Minecraft 1.10.2
-- [] Minecraft 1.9.4
-- [] Minecraft 1.8.8
-- [] Minecraft Java Edition *other versions, please specify*:
-- [] Minecraft Bedrock Edition *specify version*:
-- [] Minecraft Sponge *specify version*:
-
-### Server build info: 
-<!--- Run /version in-game or in console & paste the full output here: -->
-```
-Paste the output here, between the tick marks, replacing this text
-```
-
-### WorldEdit/FAWE versions:
-<!--- Specify which plugin you are using, and add its version. Either use /fawe version or /we version -->
-- [] FAWE version:
-- [] WorldEdit version: 
-
-### Description of the problem:
-<!--- Be as specific as possible.  Don't lie, redact information, or use false names/situations. -->
-<!--- Who, What, When, Where, Why, How, Expected behavior, Resultant behavior, etc -->
-
-### How to replicate:
-<!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
-
-## Additional Information:
-> The information here is optional for you to provide, however it may help us to more readily diagnose any compatibility and bug issues.
-
-### Other plugins being used on the server:
-<!--- Optional but recommended - issue "/plugins" in-game or in console and copy/paste the list -->
-
-### Relevant console output, log lines, and/or screenshots:
-<!--- Please use in-line code insertion 
-```
-like this
-```
-for short (20 lines or less) text blobs, or a paste service for large blobs -->
-
-### Additional relevant comments/remarks:
-<!--- Use this space to give us any additional information which may be relevant to this issue, such as: if you are using a Minecraft hosting provider; unusual installation environment; etc -->
-
-# AFFIRMATION OF COMPLETION:
-<!-- Make sure you have completed the following steps (put an "X" between of brackets): -->
-- [] I included all information required in the sections above
-- [] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/PlotSquared/issues?utf8=%E2%9C%93&q=is%3Aissue)
-- [] I made sure I am using an up-to-date version of PlotSquared
-- [] I made sure the bug/error is not caused by any other plugin
-- [x] I didn't read but checked everything above.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: PlotSquared Issue Tracker
-    url: https://issues.intellectualsites.com/projects/ps
-    about: Click here to move to our new issue tracker
-  - name: PlotSquared Suggestions
-    url: https://github.com/IntellectualSites/PlotSquaredSuggestions
-    about: If you want to submit feature or suggestion ideas, do that here

Bukkit/build.gradle

@@ -7,7 +7,7 @@ repositories {
     maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
     maven { url = "https://jitpack.io" }
     maven { url = "https://repo.codemc.org/repository/maven-public" }
-    maven { url = "http://repo.extendedclip.com/content/repositories/placeholderapi/" }
+    maven { url = "https://repo.extendedclip.com/content/repositories/placeholderapi/" }
     maven {
         name = "papermc"
         url = "https://papermc.io/repo/repository/maven-public/"
@@ -24,8 +24,8 @@ dependencies {
     implementation(project(":PlotSquared-Core"))
     compile("org.bstats:bstats-bukkit:1.7")
     compile(project(":PlotSquared-Core"))
-    compile("com.destroystokyo.paper:paper-api:1.16.1-R0.1-SNAPSHOT")
+    compile("com.destroystokyo.paper:paper-api:1.16.2-R0.1-SNAPSHOT")
-    implementation("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
+    implementation("org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT")
     compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.2.0-SNAPSHOT") {
         exclude(module: "bukkit")
 
@@ -37,7 +37,7 @@ dependencies {
     }
     implementation("me.clip:placeholderapi:2.10.6")
     implementation("net.luckperms:api:5.1")
-    implementation("net.ess3:EssentialsX:2.17.2") {
+    implementation("net.ess3:EssentialsX:2.18.0") {
         exclude(group: "io.papermc", module: "paperlib")
     }
     implementation("net.alpenblock:BungeePerms:4.0-dev-106")
@@ -45,10 +45,9 @@ dependencies {
     implementation('net.kyori:adventure-text-minimessage:3.0.0-SNAPSHOT')
     compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false }
     compile('com.sk89q:squirrelid:1.0.0-SNAPSHOT'){ transitive = false }
-    compile('be.maximvdw:MVdWPlaceholderAPI:2.1.1-SNAPSHOT'){ transitive = false }
+    compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1-SNAPSHOT'){ transitive = false }
     // logging
     implementation('org.apache.logging.log4j:log4j-slf4j-impl:2.8.1')
-    compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1-SNAPSHOT'){ transitive = false }
 }
 
 sourceCompatibility = 1.8

Bukkit/pom.xml

@@ -27,13 +27,13 @@
     <dependency>
       <groupId>com.plotsquared</groupId>
       <artifactId>PlotSquared-Core</artifactId>
-      <version>6.0.0-SUPER-SNAPSHOT</version>
+      <version>6.0.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.destroystokyo.paper</groupId>
       <artifactId>paper-api</artifactId>
-      <version>1.16.1-R0.1-SNAPSHOT</version>
+      <version>1.16.2-R0.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -131,7 +131,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.16.1-R0.1-SNAPSHOT</version>
+      <version>1.16.2-R0.1-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -155,7 +155,7 @@
     <dependency>
       <groupId>net.ess3</groupId>
       <artifactId>EssentialsX</artifactId>
-      <version>2.17.2</version>
+      <version>2.18.0</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -832,6 +832,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                             }
                             continue;
                         case "ZOMBIFIED_PIGLIN":
+                        case "PIGLIN_BRUTE":
                         case "LLAMA":
                         case "DONKEY":
                         case "MULE":

Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java

@@ -314,6 +314,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case "HOGLIN":
             case "ZOMBIFIED_PIGLIN":
             case "PIGLIN":
+            case "PIGLIN_BRUTE":
             case "ZOMBIE":
             case "WITHER":
             case "WITCH":
@@ -712,6 +713,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case "HOGLIN":
             case "PIGLIN":
             case "ZOMBIFIED_PIGLIN":
+            case "PIGLIN_BRUTE":
             case "ZOMBIE":
             case "WITHER":
             case "WITCH":

Core/build.gradle

@@ -12,6 +12,7 @@ dependencies {
         force = true
     }
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")
+    implementation("org.jetbrains:annotations:20.0.0")
     implementation("org.khelekore:prtree:1.7.0-SNAPSHOT")
     // Adventure related stuff
     implementation('net.kyori:adventure-api:4.0.0-SNAPSHOT')

Core/pom.xml

@@ -92,6 +92,12 @@
       <version>1.3.72</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <version>20.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.khelekore</groupId>
       <artifactId>prtree</artifactId>
@@ -116,6 +122,12 @@
       <version>2.8.1</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>com.intellectualsites</groupId>
+      <artifactId>Pipeline</artifactId>
+      <version>1.4.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

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

@@ -92,7 +92,7 @@ public class HomeCommand extends Command {
 
     @Nonnull private PlotQuery query(@Nonnull 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/plot/flag/GlobalFlagContainer.java

@@ -142,7 +142,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);

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="https://i.imgur.com/Kd7N6uf.png">
+    <img src="https://i.imgur.com/33Y65YL.png" width="300">
 </p>
 
 ---

build.gradle

@@ -14,6 +14,7 @@ buildscript {
     configurations.all {
         resolutionStrategy {
             force("org.ow2.asm:asm:8.0.1")
+            force("org.jetbrains:annotations:20.0.0")
         }
     }
 }
@@ -30,7 +31,7 @@ ext {
 }
 
 def ver = "6.0.0"
-def versuffix = "-SUPER-SNAPSHOT"
+def versuffix = "-SNAPSHOT"
 ext {
     if (project.hasProperty("versionsuffix")) {
         versuffix = "-$versionsuffix"
@@ -95,6 +96,7 @@ subprojects { subproject ->
         resolutionStrategy {
             force("junit:junit:4.12")
             force("com.google.guava:guava:21.0")
+            force("org.jetbrains:annotations:20.0.0")
             force("com.google.code.findbugs:jsr305:3.0.2")
         }
     }
@@ -118,7 +120,6 @@ subprojects { subproject ->
         relocate("org.json", "com.plotsquared.json") {
             exclude "org/json/simple/**"
         }
-        // relocate('org.mcstats', 'com.plotsquared.stats')
         archiveFileName = "${project.name}-${parent.version}.jar"
         destinationDirectory = file "../target"
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%