diff --git a/build.gradle.kts b/build.gradle.kts index 2fda1538..7e35493a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java - id("com.github.johnrengelman.shadow") version "8.1.0" apply false - id("io.papermc.paperweight.patcher") version "1.5.3" + id("com.github.johnrengelman.shadow") version "8.1.1" apply false + id("io.papermc.paperweight.patcher") version "1.5.5" } repositories { diff --git a/gradle.properties b/gradle.properties index ae1673bc..da78770d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ version=1.19.4-R0.1-SNAPSHOT mcVersion=1.19.4 packageVersion=1_19_R3 org.gradle.jvmargs=-Xmx2G -paperRef=8d040fad9b4ddcc49a7b70c15b80b63c479eac95 +paperRef=9846d0d89e7598fc28a8c8534d80d4c5dc42021c preVersion=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b601..bdc9a83b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/patches/server/0004-Leaves-Server-Config-And-Command.patch b/patches/server/0004-Leaves-Server-Config-And-Command.patch index 32b70424..5d06b427 100644 --- a/patches/server/0004-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0004-Leaves-Server-Config-And-Command.patch @@ -65,7 +65,7 @@ index 973ecd50f9cb6b86c353586e84d15dcb118ccb60..31f0034115a88a42b18e0b838eab8b80 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f36dd47008ba6f2668c803a3b75e2edaef6b19e5..dab4d5e2cfe569b2d00dced31d2abc455719a5ed 100644 +index 44216c40177222b5c3ef2e58690d95efe0c10318..d6e2c67650341f823f08c07c3eb576530959338d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -956,6 +956,7 @@ public final class CraftServer implements Server { @@ -92,7 +92,7 @@ index f36dd47008ba6f2668c803a3b75e2edaef6b19e5..dab4d5e2cfe569b2d00dced31d2abc45 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2743,6 +2746,14 @@ public final class CraftServer implements Server { +@@ -2739,6 +2742,14 @@ public final class CraftServer implements Server { { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -108,7 +108,7 @@ index f36dd47008ba6f2668c803a3b75e2edaef6b19e5..dab4d5e2cfe569b2d00dced31d2abc45 @Override public void restart() { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 7a561b5bf13dfa37004980705c05fdb4189449df..a511511aa641f39c34772921abaf9010220c065d 100644 +index 5891f67ccdddaa137a77ef2a2742fb965bdca6ef..570021680faa7a67165692345efe8c7fde6786ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -165,6 +165,14 @@ public class Main {