diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 61842d3ce..2a8fd96f2 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -23,8 +23,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.1.0") { exclude(module: "bukkit") @@ -36,7 +36,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") diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index 26f8a6607..f52aab5f4 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -27,7 +27,7 @@ com.destroystokyo.paper paper-api - 1.16.1-R0.1-SNAPSHOT + 1.16.2-R0.1-SNAPSHOT compile @@ -149,7 +149,7 @@ org.spigotmc spigot-api - 1.16.1-R0.1-SNAPSHOT + 1.16.2-R0.1-SNAPSHOT runtime @@ -173,7 +173,7 @@ net.ess3 EssentialsX - 2.17.2 + 2.18.0 runtime diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index f499f5d16..34cbcc5b3 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -770,6 +770,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain< } 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 83740e9db..d82c274e9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java @@ -310,6 +310,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { case "HOGLIN": case "ZOMBIFIED_PIGLIN": case "PIGLIN": + case "PIGLIN_BRUTE": case "ZOMBIE": case "WITHER": case "WITCH": @@ -711,6 +712,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/build.gradle b/build.gradle index 40639372c..6ed92cdac 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,6 @@ subprojects { 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" }