diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..5a99a2678
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @IntellectualSites/plotsquared-team
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index f1ee68845..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-name: Bug/Issue report for PlotSquared
-about: Bug / Issue report about this plugin
-title: ''
-labels: "[?] Testing Required"
-assignees: ''
-
----
-
-
-
-
-
-
-
-# Bug Report Template:
-
-## Required Information section:
-> ALL FIELDS IN THIS SECTION ARE REQUIRED, and must contain appropriate information
-### Server config info (/plot debugpaste / file paste links):
-
-
-
-**/plot debugpaste:**
-
-### Server type:
-**Select one**
-
-- [] Spigot / Paper *(CraftBukkit should not be used, re-test with Spigot first!)*
-- [] Sponge
-- [] NukkitX
-
-### PlotSquared version:
-
-```
-Paste the output here, between the tick marks, replacing this text
-```
-
-### Minecraft Version:
-**Select one**
-
-- [] 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:
-
-```
-Paste the output here, between the tick marks, replacing this text
-```
-
-### WorldEdit/FAWE versions:
-
-- [] FAWE version:
-- [] WorldEdit version:
-
-### Description of the problem:
-
-
-
-### How to replicate:
-
-
-## 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:
-
-
-### Relevant console output, log lines, and/or screenshots:
-
-
-### Additional relevant comments/remarks:
-
-
-# AFFIRMATION OF COMPLETION:
-
-- [] 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.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index fd39e3738..000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index d4c4d5994..77f82647c 100644
--- a/Bukkit/build.gradle
+++ b/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")
- implementation("org.spigotmc:spigot-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.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
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index 6a6cb057e..3fe1f3b6f 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -27,13 +27,13 @@
com.plotsquared
PlotSquared-Core
- 6.0.0-SUPER-SNAPSHOT
+ 6.0.0-SNAPSHOT
compile
com.destroystokyo.paper
paper-api
- 1.16.1-R0.1-SNAPSHOT
+ 1.16.2-R0.1-SNAPSHOT
compile
@@ -131,7 +131,7 @@
org.spigotmc
spigot-api
- 1.16.1-R0.1-SNAPSHOT
+ 1.16.2-R0.1-SNAPSHOT
runtime
@@ -155,7 +155,7 @@
net.ess3
EssentialsX
- 2.17.2
+ 2.18.0
runtime
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
index 8e2f4945b..ba454af43 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/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":
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
index 7b92b499f..e19f5b641 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
+++ b/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":
diff --git a/Core/build.gradle b/Core/build.gradle
index 5b62806a6..7e69cbeb3 100644
--- a/Core/build.gradle
+++ b/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')
diff --git a/Core/pom.xml b/Core/pom.xml
index 04d4601c4..b68879e6b 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -92,6 +92,12 @@
1.3.72
runtime
+
+ org.jetbrains
+ annotations
+ 20.0.0
+ runtime
+
org.khelekore
prtree
@@ -116,6 +122,12 @@
2.8.1
runtime
+
+ com.intellectualsites
+ Pipeline
+ 1.4.0-SNAPSHOT
+ runtime
+
junit
junit
diff --git a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
index 24f2a544c..4c30a4ef3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
+++ b/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 execute(PlotPlayer player, String[] args,
diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java b/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
index 6024281d4..5afb173b0 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
+++ b/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);
diff --git a/README.md b/README.md
index 4d5de20ef..a05b3ea21 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
- 
+ 
---
diff --git a/build.gradle b/build.gradle
index 1806aa090..3b0474633 100644
--- a/build.gradle
+++ b/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"
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda857..62d4c0535 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc26..6c9a22477 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/gradlew b/gradlew
index 2fe81a7d9..fbd7c5158 100755
--- a/gradlew
+++ b/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
diff --git a/gradlew.bat b/gradlew.bat
index 62bd9b9cc..5093609d5 100644
--- a/gradlew.bat
+++ b/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%