From e745ddd3bc5dac2c8058784322abcfbe555036a2 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:55:43 +0800 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 12 ++++----- patches/server/0003-Delete-Timings.patch | 4 +-- .../0005-Update-version-fetcher-repo.patch | 4 +-- ...006-Leaves-Server-Config-And-Command.patch | 12 ++++----- .../server/0007-Leaves-Protocol-Core.patch | 6 ++--- patches/server/0010-Fakeplayer-support.patch | 12 ++++----- patches/server/0069-SIMD-support.patch | 6 ++--- patches/server/0095-Replay-Mod-API.patch | 6 ++--- .../0111-Linear-region-file-format.patch | 6 ++--- ...tebuf-API.patch => 0122-Bytebuf-API.patch} | 6 ++--- ...22-Fix-NPE-during-creating-GUI-graph.patch | 25 ------------------- ... 0123-Allow-grindstone-overstacking.patch} | 0 ...67.patch => 0124-Configurable-MC-67.patch} | 0 ...e-end-gateway-portal-entity-ticking.patch} | 0 ...able-crystal-portal-proximity-check.patch} | 0 ...ble-LivingEntity-aiStep-alive-check.patch} | 2 +- ...lugins.patch => 0128-Leaves-plugins.patch} | 4 +-- ...atch => 0129-Fix-fortress-mob-spawn.patch} | 0 ...30-Fix-FallingBlockEntity-Duplicate.patch} | 0 ...h => 0131-Old-BlockEntity-behaviour.patch} | 0 ...s.patch => 0132-Revert-raid-changes.patch} | 0 ...3-Allow-anvil-destroy-item-entities.patch} | 0 ...-Collision-Behavior-for-Block-Shape.patch} | 0 ...tch => 0135-Disable-vault-blacklist.patch} | 0 25 files changed, 41 insertions(+), 66 deletions(-) rename patches/server/{0123-Bytebuf-API.patch => 0122-Bytebuf-API.patch} (98%) delete mode 100644 patches/server/0122-Fix-NPE-during-creating-GUI-graph.patch rename patches/server/{0124-Allow-grindstone-overstacking.patch => 0123-Allow-grindstone-overstacking.patch} (100%) rename patches/server/{0125-Configurable-MC-67.patch => 0124-Configurable-MC-67.patch} (100%) rename patches/server/{0126-Disable-end-gateway-portal-entity-ticking.patch => 0125-Disable-end-gateway-portal-entity-ticking.patch} (100%) rename patches/server/{0127-Disable-crystal-portal-proximity-check.patch => 0126-Disable-crystal-portal-proximity-check.patch} (100%) rename patches/server/{0128-Can-disable-LivingEntity-aiStep-alive-check.patch => 0127-Can-disable-LivingEntity-aiStep-alive-check.patch} (89%) rename patches/server/{0129-Leaves-plugins.patch => 0128-Leaves-plugins.patch} (99%) rename patches/server/{0130-Fix-fortress-mob-spawn.patch => 0129-Fix-fortress-mob-spawn.patch} (100%) rename patches/server/{0131-Fix-FallingBlockEntity-Duplicate.patch => 0130-Fix-FallingBlockEntity-Duplicate.patch} (100%) rename patches/server/{0132-Old-BlockEntity-behaviour.patch => 0131-Old-BlockEntity-behaviour.patch} (100%) rename patches/server/{0133-Revert-raid-changes.patch => 0132-Revert-raid-changes.patch} (100%) rename patches/server/{0134-Allow-anvil-destroy-item-entities.patch => 0133-Allow-anvil-destroy-item-entities.patch} (100%) rename patches/server/{0135-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch => 0134-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch} (100%) rename patches/server/{0136-Disable-vault-blacklist.patch => 0135-Disable-vault-blacklist.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 06f9f89d..3b6828e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=org.leavesmc.leaves version=1.21.1-R0.1-SNAPSHOT mcVersion=1.21.1 -paperRef=755a7753af6ad46756bd04b5b3bcfac46a3ec072 +paperRef=d348cb88a9fe8d19e46102c8b9febe18f746d46b preVersion=false updatingMinecraft=false org.gradle.jvmargs=-Xmx2G diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 7a6955d3..40b8e47b 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 648281575eb8d45a5c06549eb3d0f517c086fe64..ff37a984cdbf20d7f0d7b75c7f60a5d2c1e2b894 100644 +index de0474b8dce58cb419c00b7614d7dd66be832a02..0c537cd70a1b8a7d7ccd78ba212de0cae8cb6bbc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -17,7 +17,7 @@ index 648281575eb8d45a5c06549eb3d0f517c086fe64..ff37a984cdbf20d7f0d7b75c7f60a5d2 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -71,6 +71,15 @@ paperweight { +@@ -72,6 +72,15 @@ paperweight { craftBukkitPackageVersion.set("v1_21_R1") // also needs to be updated in MappingEnvironment } @@ -33,7 +33,7 @@ index 648281575eb8d45a5c06549eb3d0f517c086fe64..ff37a984cdbf20d7f0d7b75c7f60a5d2 tasks.jar { archiveClassifier.set("dev") -@@ -84,14 +93,14 @@ tasks.jar { +@@ -85,14 +94,14 @@ tasks.jar { val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -53,7 +53,7 @@ index 648281575eb8d45a5c06549eb3d0f517c086fe64..ff37a984cdbf20d7f0d7b75c7f60a5d2 "Build-Number" to (build ?: ""), "Build-Time" to Instant.now().toString(), "Git-Branch" to gitBranch, // Paper -@@ -148,7 +157,7 @@ fun TaskContainer.registerRunTask( +@@ -153,7 +162,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -62,7 +62,7 @@ index 648281575eb8d45a5c06549eb3d0f517c086fe64..ff37a984cdbf20d7f0d7b75c7f60a5d2 mainClass.set("org.bukkit.craftbukkit.Main") standardInput = System.`in` workingDir = rootProject.layout.projectDirectory -@@ -217,13 +226,13 @@ tasks.registerRunTask("runReobfBundler") { +@@ -222,13 +231,13 @@ tasks.registerRunTask("runReobfBundler") { classpath(rootProject.tasks.named("createReobfBundlerJar").flatMap { it.outputZip }) mainClass.set(null as String?) } @@ -235,7 +235,7 @@ index 759062d219ff490a3cb19e710c4d18e3e08288e0..3952428c02fe87477f4139f4fa983815 javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c1e88c31910e96ef07cece05046c0b55e708b52d..d97771ecaf06b92d92b5ca0224ae0866e36703a6 100644 +index b3ba6bccdbb08af27916f0c611c60b2595b90164..3f81f87def8e591938618c3ade8daaf5ab0f84a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -267,7 +267,7 @@ public class Main { diff --git a/patches/server/0003-Delete-Timings.patch b/patches/server/0003-Delete-Timings.patch index fbb3a0bd..71389883 100644 --- a/patches/server/0003-Delete-Timings.patch +++ b/patches/server/0003-Delete-Timings.patch @@ -1740,10 +1740,10 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index cdeb340cad6d650300bfb5e62a121449094e3ec1..1d2a8521ff45e212cd545953df730f278a05412c 100644 +index d06aab9bd5cd901c8367f9680f5d27ddb17b3dc4..0d8a128b0506b903e2cc200d6e684fd570217aec 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -200,7 +200,6 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -202,7 +202,6 @@ public final class CraftMagicNumbers implements UnsafeValues { // Paper start @Override public void reportTimings() { diff --git a/patches/server/0005-Update-version-fetcher-repo.patch b/patches/server/0005-Update-version-fetcher-repo.patch index 1df0d5f6..a2976ff7 100644 --- a/patches/server/0005-Update-version-fetcher-repo.patch +++ b/patches/server/0005-Update-version-fetcher-repo.patch @@ -27,10 +27,10 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..917ffaae401f3374d07d7fb7c024234a if (data == null) { return null; diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 6cfecd797d3cd7f9ff84755eea6dea5888ecd4f9..683a278b271bae086bf5997bc6b86ce593744734 100644 +index 0d8a128b0506b903e2cc200d6e684fd570217aec..cf30f051272b7548b5674a3d059bbcacabec963c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -482,7 +482,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -488,7 +488,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/patches/server/0006-Leaves-Server-Config-And-Command.patch b/patches/server/0006-Leaves-Server-Config-And-Command.patch index a9e2923d..ec3fd56e 100644 --- a/patches/server/0006-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0006-Leaves-Server-Config-And-Command.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config And Command diff --git a/build.gradle.kts b/build.gradle.kts -index ff37a984cdbf20d7f0d7b75c7f60a5d2c1e2b894..9179c02fcbd71bd4ca5dadef96770afaf33220f3 100644 +index 0c537cd70a1b8a7d7ccd78ba212de0cae8cb6bbc..d3bc2ed92763b701d91a8c705818e7f4e12e45f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -216,6 +216,14 @@ tasks.registerRunTask("runDevServer") { +@@ -221,6 +221,14 @@ tasks.registerRunTask("runDevServer") { jvmArgs("-DPaper.pushPaperAssetsRoot=true") } @@ -38,10 +38,10 @@ index a108ebfe472c908e86e0af2cfd9cb63083f58eb5..f97b2cb3ea855e6e250cabf357a050cd this.setPvpAllowed(dedicatedserverproperties.pvp); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b7af2d4300facf41a025c8ca322bf6541949b3ab..2568bac002ee9835e1de6b2a2cbdbdbd6aea52da 100644 +index c7df339aeb62ee627edaf1bb4c8474b61e357ba6..25e8b14e79edcf0ad2bcd224e049e0c04f8a5e5c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1098,6 +1098,7 @@ public final class CraftServer implements Server { +@@ -1100,6 +1100,7 @@ public final class CraftServer implements Server { playerMetadata.removeAll(plugin); } // Paper end @@ -49,7 +49,7 @@ index b7af2d4300facf41a025c8ca322bf6541949b3ab..2568bac002ee9835e1de6b2a2cbdbdbd this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper -@@ -2987,6 +2988,14 @@ public final class CraftServer implements Server { +@@ -2989,6 +2990,14 @@ public final class CraftServer implements Server { { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -65,7 +65,7 @@ index b7af2d4300facf41a025c8ca322bf6541949b3ab..2568bac002ee9835e1de6b2a2cbdbdbd @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 d97771ecaf06b92d92b5ca0224ae0866e36703a6..439305bb4f5ce232aa6237276c121d53054ab2a7 100644 +index 3f81f87def8e591938618c3ade8daaf5ab0f84a7..4f3c67cd469dd9c05cf8b917fe890451d1219a9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -168,6 +168,14 @@ public class Main { diff --git a/patches/server/0007-Leaves-Protocol-Core.patch b/patches/server/0007-Leaves-Protocol-Core.patch index 729025c2..7265c129 100644 --- a/patches/server/0007-Leaves-Protocol-Core.patch +++ b/patches/server/0007-Leaves-Protocol-Core.patch @@ -105,10 +105,10 @@ index 79237a490d7572eae95384f32e0ebc1a0a005c00..d0190f633e99e2a5b5dc130def10c562 ServerLevel worldserver = entityplayer.serverLevel(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2568bac002ee9835e1de6b2a2cbdbdbd6aea52da..275704db5b984584504749437e8ecdc60d4aa871 100644 +index 25e8b14e79edcf0ad2bcd224e049e0c04f8a5e5c..e79af523a49aaa6558b690383cb29649e6ae40c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -476,6 +476,7 @@ public final class CraftServer implements Server { +@@ -477,6 +477,7 @@ public final class CraftServer implements Server { this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark @@ -116,7 +116,7 @@ index 2568bac002ee9835e1de6b2a2cbdbdbd6aea52da..275704db5b984584504749437e8ecdc6 } public boolean getCommandBlockOverride(String command) { -@@ -1105,6 +1106,7 @@ public final class CraftServer implements Server { +@@ -1107,6 +1108,7 @@ public final class CraftServer implements Server { this.spark.registerCommandBeforePlugins(this); // Paper - spark this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch index 7b73420c..de0f91a1 100644 --- a/patches/server/0010-Fakeplayer-support.patch +++ b/patches/server/0010-Fakeplayer-support.patch @@ -34,7 +34,7 @@ index 35772110e9318df46a2729dbc0b5879b290011b7..f26989a44cdda9baabf337d573436c6c Set> set = (Set) playerAdvancements.criterionData.get(this); // Paper - fix AdvancementDataPlayer leak if (set != null && !set.isEmpty()) { diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 3e550f8e7cd4f4e16f499a8a2a4b95420270f07a..46d9c77581b78c427692aa8645d17b3d0c2bb6a6 100644 +index 4a8356a714ed50d4a32bcf046a2e16491bef014b..b19298aeaa0dacfe1afb1e672bd30b0c069ec968 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -104,7 +104,7 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -503,7 +503,7 @@ index b148cf247acdd36f856d0495cde4cc5ad32b5a2f..011d6c813781251c7f4041ad3a8396fb private static final Logger LOGGER = LogUtils.getLogger(); private final File playerDir; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 275704db5b984584504749437e8ecdc60d4aa871..51365bf3a487725c79a8a3adae0821ced4f7abab 100644 +index e79af523a49aaa6558b690383cb29649e6ae40c8..61dd71c2d5efbcb5dd363e2ac16757011b454082 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -310,6 +310,7 @@ public final class CraftServer implements Server { @@ -514,7 +514,7 @@ index 275704db5b984584504749437e8ecdc60d4aa871..51365bf3a487725c79a8a3adae0821ce // Paper start - Folia region threading API private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler(); -@@ -477,6 +478,7 @@ public final class CraftServer implements Server { +@@ -478,6 +479,7 @@ public final class CraftServer implements Server { datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark org.leavesmc.leaves.protocol.core.LeavesProtocolManager.init(); // Leaves - protocol @@ -522,7 +522,7 @@ index 275704db5b984584504749437e8ecdc60d4aa871..51365bf3a487725c79a8a3adae0821ce } public boolean getCommandBlockOverride(String command) { -@@ -1463,7 +1465,7 @@ public final class CraftServer implements Server { +@@ -1465,7 +1467,7 @@ public final class CraftServer implements Server { return false; } @@ -531,7 +531,7 @@ index 275704db5b984584504749437e8ecdc60d4aa871..51365bf3a487725c79a8a3adae0821ce return false; } -@@ -3226,4 +3228,11 @@ public final class CraftServer implements Server { +@@ -3228,4 +3230,11 @@ public final class CraftServer implements Server { return this.potionBrewer; } // Paper end @@ -544,7 +544,7 @@ index 275704db5b984584504749437e8ecdc60d4aa871..51365bf3a487725c79a8a3adae0821ce + // Leaves end - Bot API } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 33e4818ba5a90d78d69baad9f6b1be1b1382e9f3..db2c1139f8471d12d6b80aab630b1426a084e47c 100644 +index e76186d580a2d7f1a83af4600b0bdd435b67eba3..ce3d2a893729a95c6a74a373849dd42e04f7d68b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -245,7 +245,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0069-SIMD-support.patch b/patches/server/0069-SIMD-support.patch index c4150379..4886c231 100644 --- a/patches/server/0069-SIMD-support.patch +++ b/patches/server/0069-SIMD-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] SIMD support diff --git a/build.gradle.kts b/build.gradle.kts -index 143f5bf36f550ccfa414dbbf9c00c9710798f66b..c06861f287088c04363f45d6e91d29a8596cf8d4 100644 +index d3bc2ed92763b701d91a8c705818e7f4e12e45f0..51bf5df7bca5b32e171e452d62f6843a7a10fee1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -77,6 +77,7 @@ tasks.withType { +@@ -78,6 +78,7 @@ tasks.withType { compilerArgs.add("-Xlint:-module") compilerArgs.add("-Xlint:-removal") compilerArgs.add("-Xlint:-dep-ann") @@ -16,7 +16,7 @@ index 143f5bf36f550ccfa414dbbf9c00c9710798f66b..c06861f287088c04363f45d6e91d29a8 } // Leaves end - hide irrelevant compilation warnings -@@ -186,6 +187,8 @@ fun TaskContainer.registerRunTask( +@@ -191,6 +192,8 @@ fun TaskContainer.registerRunTask( minHeapSize = "${memoryGb}G" maxHeapSize = "${memoryGb}G" diff --git a/patches/server/0095-Replay-Mod-API.patch b/patches/server/0095-Replay-Mod-API.patch index bb319607..8e81e931 100644 --- a/patches/server/0095-Replay-Mod-API.patch +++ b/patches/server/0095-Replay-Mod-API.patch @@ -169,7 +169,7 @@ index fc7ce6a031c50d270a979ec57e05cec0de7426c2..1337c4c2e966a8eeeee3480206025a6e } // Leaves end - skip diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 875f88b62d62cc94b1ec09f9cedefc2722ddb5cc..57affff03dab850a2d4b37da2d2f8f0177d7dac9 100644 +index 3322ee4e6720c8b06e6d6684cbac95c2d14babb1..fc6d2d5febe4a8c7f315997b3dde38b0dd70d03a 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -124,6 +124,7 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent; @@ -390,7 +390,7 @@ index 875f88b62d62cc94b1ec09f9cedefc2722ddb5cc..57affff03dab850a2d4b37da2d2f8f01 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 51365bf3a487725c79a8a3adae0821ced4f7abab..2b7577c3f437e7cb3c3aa000d70fb966c9b4617a 100644 +index 61dd71c2d5efbcb5dd363e2ac16757011b454082..8649eae46402d53290f17181003bda5e97114d82 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -311,6 +311,7 @@ public final class CraftServer implements Server { @@ -410,7 +410,7 @@ index 51365bf3a487725c79a8a3adae0821ced4f7abab..2b7577c3f437e7cb3c3aa000d70fb966 @Override public CraftPlayer apply(ServerPlayer player) { return player.getBukkitEntity(); -@@ -3235,4 +3236,11 @@ public final class CraftServer implements Server { +@@ -3237,4 +3238,11 @@ public final class CraftServer implements Server { return botManager; } // Leaves end - Bot API diff --git a/patches/server/0111-Linear-region-file-format.patch b/patches/server/0111-Linear-region-file-format.patch index c5441808..d578b218 100644 --- a/patches/server/0111-Linear-region-file-format.patch +++ b/patches/server/0111-Linear-region-file-format.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Linear region file format This patch is Powered by LinearPurpur(https://github.com/StupidCraft/LinearPurpur) diff --git a/build.gradle.kts b/build.gradle.kts -index c06861f287088c04363f45d6e91d29a8596cf8d4..51af52ca06c237fa80df8df8fce86147b6390a08 100644 +index 51bf5df7bca5b32e171e452d62f6843a7a10fee1..ecc29f64b5cbd2849f86d22aee8a76d172b3def0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,6 +30,10 @@ dependencies { @@ -18,7 +18,7 @@ index c06861f287088c04363f45d6e91d29a8596cf8d4..51af52ca06c237fa80df8df8fce86147 + implementation("org.lz4:lz4-java:1.8.0") + // Leaves end - Linear format implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion - implementation("org.ow2.asm:asm-commons:9.7") + implementation("org.ow2.asm:asm-commons:9.7.1") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java index 73df26b27146bbad2106d57b22dd3c792ed3dd1d..f3bd1488da34ea796c8205088e83d4c5dbd9f6bc 100644 @@ -113,7 +113,7 @@ index cb39c629af1827078f35904a373d35a63fea17ff..4f8ec87adc72f096caeb4bb437c5f43b } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index eb0389ad86300665b6e057bcfa1d7c068dc6c6ab..22cfab0214c75bab89c4aeeb98fdc81340b0fe4a 100644 +index 1e0439cf3f4008fa430acb90b45f5bc4cdd6d7f2..d7475e04fbfd41bde70ffdbc1fffa7a023b7ca8e 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -28,7 +28,7 @@ import net.minecraft.nbt.NbtIo; // Paper diff --git a/patches/server/0123-Bytebuf-API.patch b/patches/server/0122-Bytebuf-API.patch similarity index 98% rename from patches/server/0123-Bytebuf-API.patch rename to patches/server/0122-Bytebuf-API.patch index f4dd41dc..d63b4a5f 100644 --- a/patches/server/0123-Bytebuf-API.patch +++ b/patches/server/0122-Bytebuf-API.patch @@ -18,7 +18,7 @@ index 2de8da4dbe2f7b9da740a90829f18bff0b3d5b8c..a8af45393b4733ea3b6639ad7d890896 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 57affff03dab850a2d4b37da2d2f8f0177d7dac9..3d35d75918dac54dab83080d03dd01c749f77ce8 100644 +index fc6d2d5febe4a8c7f315997b3dde38b0dd70d03a..b440103be9aaef22a0ea42d0ed05f92a0ceca924 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -466,6 +466,12 @@ public abstract class PlayerList { @@ -35,7 +35,7 @@ index 57affff03dab850a2d4b37da2d2f8f0177d7dac9..3d35d75918dac54dab83080d03dd01c7 // Leaves start - bot support diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2b7577c3f437e7cb3c3aa000d70fb966c9b4617a..bc761acab810d92afc6ec49565051eb297c35ef5 100644 +index 8649eae46402d53290f17181003bda5e97114d82..402e590454764117f3f20649bbf13148d0fce521 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -312,6 +312,7 @@ public final class CraftServer implements Server { @@ -46,7 +46,7 @@ index 2b7577c3f437e7cb3c3aa000d70fb966c9b4617a..bc761acab810d92afc6ec49565051eb2 // Paper start - Folia region threading API private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler(); -@@ -3243,4 +3244,15 @@ public final class CraftServer implements Server { +@@ -3245,4 +3246,15 @@ public final class CraftServer implements Server { return photographerManager; } // Leaves end - replay mod api diff --git a/patches/server/0122-Fix-NPE-during-creating-GUI-graph.patch b/patches/server/0122-Fix-NPE-during-creating-GUI-graph.patch deleted file mode 100644 index 6efaca90..00000000 --- a/patches/server/0122-Fix-NPE-during-creating-GUI-graph.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> -Date: Tue, 27 Feb 2024 03:27:48 -0500 -Subject: [PATCH] Fix NPE during creating GUI graph - - -diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..7bf45a85d51ea0e2c6dfa1c5f2f07f99dab0bca6 100644 ---- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -+++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -@@ -59,7 +59,13 @@ public class RAMDetails extends JList { - GraphData data = RAMGraph.DATA.peekLast(); - Vector vector = new Vector<>(); - -- double[] tps = org.bukkit.Bukkit.getTPS(); -+ // Leaves start - Fix potential NPE during creating GUI graph -+ double[] tps = new double[]{ -+ server.tps1.getAverage(), -+ server.tps5.getAverage(), -+ server.tps15.getAverage() -+ }; -+ // Leaves end - String[] tpsAvg = new String[tps.length]; - - for ( int g = 0; g < tps.length; g++) { diff --git a/patches/server/0124-Allow-grindstone-overstacking.patch b/patches/server/0123-Allow-grindstone-overstacking.patch similarity index 100% rename from patches/server/0124-Allow-grindstone-overstacking.patch rename to patches/server/0123-Allow-grindstone-overstacking.patch diff --git a/patches/server/0125-Configurable-MC-67.patch b/patches/server/0124-Configurable-MC-67.patch similarity index 100% rename from patches/server/0125-Configurable-MC-67.patch rename to patches/server/0124-Configurable-MC-67.patch diff --git a/patches/server/0126-Disable-end-gateway-portal-entity-ticking.patch b/patches/server/0125-Disable-end-gateway-portal-entity-ticking.patch similarity index 100% rename from patches/server/0126-Disable-end-gateway-portal-entity-ticking.patch rename to patches/server/0125-Disable-end-gateway-portal-entity-ticking.patch diff --git a/patches/server/0127-Disable-crystal-portal-proximity-check.patch b/patches/server/0126-Disable-crystal-portal-proximity-check.patch similarity index 100% rename from patches/server/0127-Disable-crystal-portal-proximity-check.patch rename to patches/server/0126-Disable-crystal-portal-proximity-check.patch diff --git a/patches/server/0128-Can-disable-LivingEntity-aiStep-alive-check.patch b/patches/server/0127-Can-disable-LivingEntity-aiStep-alive-check.patch similarity index 89% rename from patches/server/0128-Can-disable-LivingEntity-aiStep-alive-check.patch rename to patches/server/0127-Can-disable-LivingEntity-aiStep-alive-check.patch index 22a3c70a..c03a24f9 100644 --- a/patches/server/0128-Can-disable-LivingEntity-aiStep-alive-check.patch +++ b/patches/server/0127-Can-disable-LivingEntity-aiStep-alive-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Can disable LivingEntity aiStep alive check diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c578497c824021e571b21b1b938705e7f585632c..0730c2a7fe66e38b71df15050b17d2acb6b47251 100644 +index a55264e08b595005e30b3bf0b17a23e7de563bc3..dbe8f6f366e02a035cf4fea81a0bda0322c6b360 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3193,7 +3193,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0129-Leaves-plugins.patch b/patches/server/0128-Leaves-plugins.patch similarity index 99% rename from patches/server/0129-Leaves-plugins.patch rename to patches/server/0128-Leaves-plugins.patch index bc505b40..6e15ba99 100644 --- a/patches/server/0129-Leaves-plugins.patch +++ b/patches/server/0128-Leaves-plugins.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves plugins diff --git a/build.gradle.kts b/build.gradle.kts -index 51af52ca06c237fa80df8df8fce86147b6390a08..1ee3da2cd5fd219a5c627d8670d86368e3f137d5 100644 +index ecc29f64b5cbd2849f86d22aee8a76d172b3def0..881896b9f25afc530f4c04096ee364b80f8e8e0c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,6 +34,7 @@ dependencies { @@ -14,7 +14,7 @@ index 51af52ca06c237fa80df8df8fce86147b6390a08..1ee3da2cd5fd219a5c627d8670d86368 // Leaves end - Linear format + implementation("org.spongepowered:configurate-hocon:4.2.0-SNAPSHOT") // Leaves - leaves plugins implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion - implementation("org.ow2.asm:asm-commons:9.7") + implementation("org.ow2.asm:asm-commons:9.7.1") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java index f0fce4113fb07c64adbec029d177c236cbdcbae8..f3cb913f29e1aff46233af2f086d205a51ac582d 100644 diff --git a/patches/server/0130-Fix-fortress-mob-spawn.patch b/patches/server/0129-Fix-fortress-mob-spawn.patch similarity index 100% rename from patches/server/0130-Fix-fortress-mob-spawn.patch rename to patches/server/0129-Fix-fortress-mob-spawn.patch diff --git a/patches/server/0131-Fix-FallingBlockEntity-Duplicate.patch b/patches/server/0130-Fix-FallingBlockEntity-Duplicate.patch similarity index 100% rename from patches/server/0131-Fix-FallingBlockEntity-Duplicate.patch rename to patches/server/0130-Fix-FallingBlockEntity-Duplicate.patch diff --git a/patches/server/0132-Old-BlockEntity-behaviour.patch b/patches/server/0131-Old-BlockEntity-behaviour.patch similarity index 100% rename from patches/server/0132-Old-BlockEntity-behaviour.patch rename to patches/server/0131-Old-BlockEntity-behaviour.patch diff --git a/patches/server/0133-Revert-raid-changes.patch b/patches/server/0132-Revert-raid-changes.patch similarity index 100% rename from patches/server/0133-Revert-raid-changes.patch rename to patches/server/0132-Revert-raid-changes.patch diff --git a/patches/server/0134-Allow-anvil-destroy-item-entities.patch b/patches/server/0133-Allow-anvil-destroy-item-entities.patch similarity index 100% rename from patches/server/0134-Allow-anvil-destroy-item-entities.patch rename to patches/server/0133-Allow-anvil-destroy-item-entities.patch diff --git a/patches/server/0135-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch b/patches/server/0134-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch similarity index 100% rename from patches/server/0135-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch rename to patches/server/0134-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch diff --git a/patches/server/0136-Disable-vault-blacklist.patch b/patches/server/0135-Disable-vault-blacklist.patch similarity index 100% rename from patches/server/0136-Disable-vault-blacklist.patch rename to patches/server/0135-Disable-vault-blacklist.patch