diff --git a/gradle.properties b/gradle.properties index 08b43b2e..399a5925 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ version = 1.18.2-R0.1-SNAPSHOT mcVersion = 1.18.2 packageVersion = 1_18_R2 org.gradle.jvmargs=-Xmx2G -paperRef=c6e631aacb3a418e39a59d22a73deb404be6fe94 +paperRef=76ed1567647011e23266b9da97624200ebe7639d diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch index 85db8aba..80fb0e32 100644 --- a/patches/api/0001-Leaves-Server-Config.patch +++ b/patches/api/0001-Leaves-Server-Config.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index a62c27777672eff1c488517b37876e3a44a2d57d..ad611fa48e5b1a5bd028672aa914d38a743c8f61 100644 +index 7a3a2ff605e06e42ba2a0263e2c50eed5c24f8e9..2c788fd242e6f55bb0c250ff48e68a54c420a59b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1885,6 +1885,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1898,6 +1898,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi throw new UnsupportedOperationException("Not supported yet."); } // Paper end diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 12e5f3d9..ca6c0aaa 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -84,10 +84,10 @@ index c8d56947305c981a3268ce4ae3e975db350ceff2..0706891d8b042675eb67b367324925c5 public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5be9e73dc0314831bbaa6301fc704295dd8ed2bc..8b924e2da5bc18e00aecfad3e6a96072f3a7d2a5 100644 +index ba4578fb4a2d861a6ffbb0ec022db31d9d7cc2be..ddeeddfe252c405913864af3ec1aaec333f65ded 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper +@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { diff --git a/patches/server/0003-Leaves-Server-Config.patch b/patches/server/0003-Leaves-Server-Config.patch index 71e28030..a306cab5 100644 --- a/patches/server/0003-Leaves-Server-Config.patch +++ b/patches/server/0003-Leaves-Server-Config.patch @@ -33,7 +33,7 @@ index 0706891d8b042675eb67b367324925c52b6d8ddc..07f3ac18b83357bfc75aa6b6d3ee0bfe org.spigotmc.WatchdogThread.hasStarted = true; // Paper Arrays.fill( recentTps, 20 ); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index e28e09aae1d95d9bed50a137e999e6d457e62478..e92b98177189df1b162b648c0e259035c7ec2263 100644 +index 257c94f7c1cb00c9a91ab82e311dfd8eca29c538..705797683bea7b29a873f01ddb99496f1a17eb40 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -235,6 +235,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -67,10 +67,10 @@ index 160c0f37aa3aaf7598f852acf9bd444f79444c97..53409a2c7cf2143e085c724a6e96e8ea 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 8b924e2da5bc18e00aecfad3e6a96072f3a7d2a5..407f7c269680eb4234d7562614005d322d5cb454 100644 +index ddeeddfe252c405913864af3ec1aaec333f65ded..b932ea565a8381817dc159b938757666d8e167c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -955,6 +955,7 @@ public final class CraftServer implements Server { +@@ -956,6 +956,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper @@ -78,7 +78,7 @@ index 8b924e2da5bc18e00aecfad3e6a96072f3a7d2a5..407f7c269680eb4234d7562614005d32 for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -971,6 +972,7 @@ public final class CraftServer implements Server { +@@ -972,6 +973,7 @@ public final class CraftServer implements Server { } world.spigotConfig.init(); // Spigot world.paperConfig.init(); // Paper @@ -86,7 +86,7 @@ index 8b924e2da5bc18e00aecfad3e6a96072f3a7d2a5..407f7c269680eb4234d7562614005d32 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -2693,6 +2695,14 @@ public final class CraftServer implements Server { +@@ -2700,6 +2702,14 @@ public final class CraftServer implements Server { { return com.destroystokyo.paper.PaperConfig.config; } diff --git a/patches/server/0008-Add-Leaves-Command.patch b/patches/server/0008-Add-Leaves-Command.patch index eb4390be..586d0322 100644 --- a/patches/server/0008-Add-Leaves-Command.patch +++ b/patches/server/0008-Add-Leaves-Command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Leaves Command diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index e92b98177189df1b162b648c0e259035c7ec2263..4f0d97c51db4313a73e46878546ca4c192b483d0 100644 +index 705797683bea7b29a873f01ddb99496f1a17eb40..dddbbdf2a5b3f7e28253c88b307ad42ca7f6b36b 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -237,6 +237,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -17,10 +17,10 @@ index e92b98177189df1b162b648c0e259035c7ec2263..4f0d97c51db4313a73e46878546ca4c1 this.setPvpAllowed(dedicatedserverproperties.pvp); this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3fb3fc5b30d3cb171047cfb9caebf064a83f02bc..5b33ca9c6e97dfb8cd60e08272c6bc8022ede687 100644 +index b932ea565a8381817dc159b938757666d8e167c7..e1b15532a60152d058ed0e1c68c0cff5ef481895 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -988,6 +988,7 @@ public final class CraftServer implements Server { +@@ -989,6 +989,7 @@ public final class CraftServer implements Server { this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper diff --git a/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch index 9d11674e..5a928d98 100644 --- a/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch +++ b/patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index fdd76d1a1636f30f519c434b41061d826c4a8261..ab14416e0a035b46c8721c67921e2670066e9de1 100644 +index 1521f53ee1bd85ca44a68b2c9d969eaf63fa342e..d036762b963dfcfbc398e0e995e0d59808e74b62 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1507,12 +1507,12 @@ public abstract class LivingEntity extends Entity { @@ -23,7 +23,7 @@ index fdd76d1a1636f30f519c434b41061d826c4a8261..ab14416e0a035b46c8721c67921e2670 itemstack1.shrink(1); } if (itemstack != null && this instanceof ServerPlayer) { -@@ -4334,3 +4334,4 @@ public abstract class LivingEntity extends Entity { +@@ -4342,3 +4342,4 @@ public abstract class LivingEntity extends Entity { // CraftBukkit end } }