Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-28 17:38:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

1.16.2 support

Browse Source 
- Bump EssentialsX version to the latest release
This commit is contained in:
N0tMyFaultOG 2020-08-11 16:20:33 +02:00
parent 9fd11fbe13
commit 7c756304b5
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit/build.gradle
View File

@ -23,8 +23,8 @@ dependencies {
implementation(project(":PlotSquared-Core")) implementation(project(":PlotSquared-Core"))
compile("org.bstats:bstats-bukkit:1.7") compile("org.bstats:bstats-bukkit:1.7")
compile(project(":PlotSquared-Core")) 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.1.0") { compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.1.0") {
exclude(module: "bukkit") exclude(module: "bukkit")
@ -36,7 +36,7 @@ dependencies {
} }
implementation("me.clip:placeholderapi:2.10.6") implementation("me.clip:placeholderapi:2.10.6")
implementation("net.luckperms:api:5.1") 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") exclude(group: "io.papermc", module: "paperlib")
} }
implementation("net.alpenblock:BungeePerms:4.0-dev-106") implementation("net.alpenblock:BungeePerms:4.0-dev-106")

6
Bukkit/pom.xml
View File

@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>com.destroystokyo.paper</groupId> <groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId> <artifactId>paper-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.2-R0.1-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -149,7 +149,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.2-R0.1-SNAPSHOT</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -173,7 +173,7 @@
<dependency> <dependency>
<groupId>net.ess3</groupId> <groupId>net.ess3</groupId>
<artifactId>EssentialsX</artifactId> <artifactId>EssentialsX</artifactId>
<version>2.17.2</version> <version>2.18.0</version>
<scope>runtime</scope> <scope>runtime</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

1
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@ -770,6 +770,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain<
} }
continue; continue;
case "ZOMBIFIED_PIGLIN": case "ZOMBIFIED_PIGLIN":
case "PIGLIN_BRUTE":
case "LLAMA": case "LLAMA":
case "DONKEY": case "DONKEY":
case "MULE": case "MULE":

2
Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
View File

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

1
build.gradle
View File

@ -127,7 +127,6 @@ subprojects {
relocate("org.json", "com.plotsquared.json") { relocate("org.json", "com.plotsquared.json") {
exclude "org/json/simple/**" exclude "org/json/simple/**"
} }
// relocate('org.mcstats', 'com.plotsquared.stats')
archiveFileName = "${project.name}-${parent.version}.jar" archiveFileName = "${project.name}-${parent.version}.jar"
destinationDirectory = file "../target" destinationDirectory = file "../target"
} }