diff --git a/README.md b/README.md index b2fd4a3ece..2e10c15d15 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.19.3-R0.1-SNAPSHOT + 1.19.4-R0.1-SNAPSHOT provided ``` @@ -54,7 +54,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT") } java { diff --git a/build.gradle.kts b/build.gradle.kts index 784fd547c6..11609e3881 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.19.3+build.1:mergedv2") + paramMappings("net.fabricmc:yarn:1.19.4+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.8.6:fat") decompiler("net.minecraftforge:forgeflower:2.0.627.2") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") @@ -133,7 +133,7 @@ allprojects { tasks.collectAtsFromPatches { // Uncomment while updating for a new Minecraft version - //extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) + extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) } tasks.register("printMinecraftVersion") { diff --git a/gradle.properties b/gradle.properties index 0c899c224a..080537633e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group=io.papermc.paper -version=1.19.3-R0.1-SNAPSHOT -mcVersion=1.19.3 +version=1.19.4-R0.1-SNAPSHOT +mcVersion=1.19.4 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 5c21cf5dbb..3f9488e671 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -27,10 +27,10 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943 +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..386d8c36510e69a69ce4536e67af4a6e4e886685 +index 0000000000000000000000000000000000000000..17e8858e01d80c422947f507e9d77b7532788752 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,81 @@ +@@ -0,0 +1,82 @@ +plugins { + `java-library` + `maven-publish` @@ -47,6 +47,7 @@ index 0000000000000000000000000000000000000000..386d8c36510e69a69ce4536e67af4a6e + api("com.google.code.gson:gson:2.10") + api("net.md-5:bungeecord-chat:1.16-R0.4") + api("org.yaml:snakeyaml:1.33") ++ api("org.joml:joml:1.10.5") + + compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") @@ -114,10 +115,10 @@ index 0000000000000000000000000000000000000000..386d8c36510e69a69ce4536e67af4a6e +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index afe250e329e19a56f58085efeaa28d86b79118ec..0000000000000000000000000000000000000000 +index 829ebece9d376cbade1422c58759540054fbedbe..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,254 +0,0 @@ +@@ -1,261 +0,0 @@ - - @@ -125,7 +126,7 @@ index afe250e329e19a56f58085efeaa28d86b79118ec..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.19.3-R0.1-SNAPSHOT +- 1.19.4-R0.1-SNAPSHOT - jar - - Spigot-API @@ -165,6 +166,13 @@ index afe250e329e19a56f58085efeaa28d86b79118ec..00000000000000000000000000000000 - 2.10 - compile - +- +- +- org.joml +- joml +- 1.10.5 +- compile +- - - net.md-5 - bungeecord-chat diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index de7d3b2aa3..5b6f7d5ae6 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d240e37d64d +index 0000000000000000000000000000000000000000..6aed6ea708639e43aea6ed467792a55b747fdad7 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,137 @@ @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24 + implementation("org.ow2.asm:asm:9.4") + implementation("commons-lang:commons-lang:2.6") + runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3") -+ runtimeOnly("mysql:mysql-connector-java:8.0.29") ++ runtimeOnly("com.mysql:mysql-connector-j:8.0.32") + + runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") @@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24 + testImplementation("org.hamcrest:hamcrest-library:1.3") +} + -+val craftbukkitPackageVersion = "1_19_R2" // Paper ++val craftbukkitPackageVersion = "1_19_R3" // Paper +tasks.jar { + archiveClassifier.set("dev") + @@ -171,17 +171,17 @@ index 0000000000000000000000000000000000000000..c9950851db38df64fd82a3a549072d24 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..0000000000000000000000000000000000000000 +index 9c1719f6931450637a93f64fd2b43b2cd00929a0..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,617 +0,0 @@ +@@ -1,585 +0,0 @@ - - 4.0.0 - org.spigotmc - spigot - jar -- 1.19.3-R0.1-SNAPSHOT +- 1.19.4-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - @@ -197,7 +197,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000 - UTF-8 - unknown - git -- 1_19_R2 +- 1_19_R3 - 17 - 17 - @@ -251,7 +251,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000 - - com.mojang - authlib -- 3.16.29 +- 3.17.30 - compile - - @@ -263,13 +263,7 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000 - - com.mojang - datafixerupper -- 5.0.28 -- compile -- -- -- com.mojang -- javabridge -- 2.0.25 +- 6.0.6 - compile - - @@ -389,12 +383,6 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000 - compile - - -- org.joml -- joml -- 1.10.5 -- compile -- -- - org.slf4j - slf4j-api - 2.0.1 @@ -417,13 +405,13 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000 - - org.xerial - sqlite-jdbc -- 3.36.0.3 +- 3.41.0.0 - runtime - - -- mysql -- mysql-connector-java -- 8.0.29 +- com.mysql +- mysql-connector-j +- 8.0.32 - runtime - - @@ -728,26 +716,6 @@ index 1f24a779e3dd95a796f7eae2b2097b5aabc4fdb8..00000000000000000000000000000000 - - - -- -- org.codehaus.mojo -- animal-sniffer-maven-plugin -- 1.21 -- -- -- process-classes -- -- -- -- -- -- -- -- org.codehaus.mojo.signature -- java18 -- 1.0 -- -- -- - - - diff --git a/patches/api/0002-Build-system-changes.patch b/patches/unapplied/api/0002-Build-system-changes.patch similarity index 97% rename from patches/api/0002-Build-system-changes.patch rename to patches/unapplied/api/0002-Build-system-changes.patch index f56de5eb15..98f0710892 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/unapplied/api/0002-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 9686f621c7b837a7a38ffb2fea10ae492b18556d..2b3288057d67e5add4e22e6b7072527057bcd808 100644 +index 386d8c36510e69a69ce4536e67af4a6e4e886685..75d59838512a8385c95222083a67b81d060b6a90 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,15 +14,27 @@ dependencies { diff --git a/patches/api/0003-Test-changes.patch b/patches/unapplied/api/0003-Test-changes.patch similarity index 99% rename from patches/api/0003-Test-changes.patch rename to patches/unapplied/api/0003-Test-changes.patch index ade12ea30c..cebba1f620 100644 --- a/patches/api/0003-Test-changes.patch +++ b/patches/unapplied/api/0003-Test-changes.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Test changes Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 2b3288057d67e5add4e22e6b7072527057bcd808..4b3453f8dab6008b6fad6245fb7205da33b4bfb8 100644 +index 75d59838512a8385c95222083a67b81d060b6a90..4c34d36b1f62ea08e6a64d15effb3c07370200cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,6 +34,7 @@ dependencies { diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch similarity index 86% rename from patches/api/0004-Add-FastUtil-to-Bukkit.patch rename to patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch index f89eda3100..1e19cea19d 100644 --- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch +++ b/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/build.gradle.kts b/build.gradle.kts -index 4b3453f8dab6008b6fad6245fb7205da33b4bfb8..d217f708b5bc57e402f4c2179ae3aea555b40f92 100644 +index 4c34d36b1f62ea08e6a64d15effb3c07370200cf..57634e3710f459e6f42c5d284d873091afdd1ea4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { diff --git a/patches/api/0005-Adventure.patch b/patches/unapplied/api/0005-Adventure.patch similarity index 99% rename from patches/api/0005-Adventure.patch rename to patches/unapplied/api/0005-Adventure.patch index e57921943c..b0b97dfe0e 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/unapplied/api/0005-Adventure.patch @@ -7,7 +7,7 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index d217f708b5bc57e402f4c2179ae3aea555b40f92..4ad00c44b635e1d0b882399b0c76ab32d6bb2501 100644 +index 57634e3710f459e6f42c5d284d873091afdd1ea4..45f29dd1b1d683f6a4d8b91b81274565d75d4d73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,17 +8,37 @@ java { diff --git a/patches/api/0006-Paper-Utils.patch b/patches/unapplied/api/0006-Paper-Utils.patch similarity index 100% rename from patches/api/0006-Paper-Utils.patch rename to patches/unapplied/api/0006-Paper-Utils.patch diff --git a/patches/api/0007-Use-ASM-for-event-executors.patch b/patches/unapplied/api/0007-Use-ASM-for-event-executors.patch similarity index 100% rename from patches/api/0007-Use-ASM-for-event-executors.patch rename to patches/unapplied/api/0007-Use-ASM-for-event-executors.patch diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/unapplied/api/0008-Paper-Plugins.patch similarity index 100% rename from patches/api/0008-Paper-Plugins.patch rename to patches/unapplied/api/0008-Paper-Plugins.patch diff --git a/patches/api/0009-Add-Position.patch b/patches/unapplied/api/0009-Add-Position.patch similarity index 100% rename from patches/api/0009-Add-Position.patch rename to patches/unapplied/api/0009-Add-Position.patch diff --git a/patches/api/0010-Timings-v2.patch b/patches/unapplied/api/0010-Timings-v2.patch similarity index 99% rename from patches/api/0010-Timings-v2.patch rename to patches/unapplied/api/0010-Timings-v2.patch index 8102412e83..0a4e451389 100644 --- a/patches/api/0010-Timings-v2.patch +++ b/patches/unapplied/api/0010-Timings-v2.patch @@ -3472,7 +3472,7 @@ index f64a90241ce7f73e111e6b5ac6ff87cd93583c0e..f13dcbe448111b24b36105d25527ba87 // Paper start diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index d0ad072c832b8fc8a1cfdcafdd42c724531a2e29..02062284dbc1a6c923ceffa5e4d6a3be8c7429d3 100644 +index ab04ffe4cd05315a2ee0f64c553b4c674740eb7f..de6b6188587fd254ab96cbc1f95fda2056d9cbe2 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -55,7 +55,6 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 97% rename from patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch index c3bb33b35f..530c6d8fa9 100644 --- a/patches/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/unapplied/api/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -82,7 +82,7 @@ index f13dcbe448111b24b36105d25527ba87ccc9334e..3fcb73a0fc2daaeb76dd4c6757afce52 } Preconditions.checkArgument(directory != null, "Directory cannot be null"); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 02062284dbc1a6c923ceffa5e4d6a3be8c7429d3..88d852c1a729ffd5951da803da424b31591c9f9a 100644 +index de6b6188587fd254ab96cbc1f95fda2056d9cbe2..eaefbb00e9993d54906cc8cf35cf753c0d6c7707 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -93,7 +93,7 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/patches/api/0012-Player-affects-spawning-API.patch b/patches/unapplied/api/0012-Player-affects-spawning-API.patch similarity index 100% rename from patches/api/0012-Player-affects-spawning-API.patch rename to patches/unapplied/api/0012-Player-affects-spawning-API.patch diff --git a/patches/api/0013-Add-getTPS-method.patch b/patches/unapplied/api/0013-Add-getTPS-method.patch similarity index 100% rename from patches/api/0013-Add-getTPS-method.patch rename to patches/unapplied/api/0013-Add-getTPS-method.patch diff --git a/patches/api/0014-Version-Command-2.0.patch b/patches/unapplied/api/0014-Version-Command-2.0.patch similarity index 100% rename from patches/api/0014-Version-Command-2.0.patch rename to patches/unapplied/api/0014-Version-Command-2.0.patch diff --git a/patches/api/0015-Entity-Origin-API.patch b/patches/unapplied/api/0015-Entity-Origin-API.patch similarity index 100% rename from patches/api/0015-Entity-Origin-API.patch rename to patches/unapplied/api/0015-Entity-Origin-API.patch diff --git a/patches/api/0016-Add-PlayerLocaleChangeEvent.patch b/patches/unapplied/api/0016-Add-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/api/0016-Add-PlayerLocaleChangeEvent.patch rename to patches/unapplied/api/0016-Add-PlayerLocaleChangeEvent.patch diff --git a/patches/api/0017-Add-view-distance-API.patch b/patches/unapplied/api/0017-Add-view-distance-API.patch similarity index 100% rename from patches/api/0017-Add-view-distance-API.patch rename to patches/unapplied/api/0017-Add-view-distance-API.patch diff --git a/patches/api/0018-Add-BeaconEffectEvent.patch b/patches/unapplied/api/0018-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/api/0018-Add-BeaconEffectEvent.patch rename to patches/unapplied/api/0018-Add-BeaconEffectEvent.patch diff --git a/patches/api/0019-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/api/0019-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/api/0019-Add-PlayerInitialSpawnEvent.patch rename to patches/unapplied/api/0019-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/api/0020-Expose-server-CommandMap.patch b/patches/unapplied/api/0020-Expose-server-CommandMap.patch similarity index 100% rename from patches/api/0020-Expose-server-CommandMap.patch rename to patches/unapplied/api/0020-Expose-server-CommandMap.patch diff --git a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/unapplied/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 100% rename from patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to patches/unapplied/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch diff --git a/patches/api/0022-Add-exception-reporting-event.patch b/patches/unapplied/api/0022-Add-exception-reporting-event.patch similarity index 100% rename from patches/api/0022-Add-exception-reporting-event.patch rename to patches/unapplied/api/0022-Add-exception-reporting-event.patch diff --git a/patches/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/unapplied/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch similarity index 100% rename from patches/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch rename to patches/unapplied/api/0023-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch diff --git a/patches/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/unapplied/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch similarity index 100% rename from patches/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch rename to patches/unapplied/api/0024-Fix-ServerListPingEvent-flagging-as-Async.patch diff --git a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/api/0025-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/api/0025-Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/api/0025-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/api/0026-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/api/0027-Complete-resource-pack-API.patch b/patches/unapplied/api/0027-Complete-resource-pack-API.patch similarity index 100% rename from patches/api/0027-Complete-resource-pack-API.patch rename to patches/unapplied/api/0027-Complete-resource-pack-API.patch diff --git a/patches/api/0028-Add-a-call-helper-to-Event.patch b/patches/unapplied/api/0028-Add-a-call-helper-to-Event.patch similarity index 100% rename from patches/api/0028-Add-a-call-helper-to-Event.patch rename to patches/unapplied/api/0028-Add-a-call-helper-to-Event.patch diff --git a/patches/api/0029-Add-sender-name-to-commands.yml-replacement.patch b/patches/unapplied/api/0029-Add-sender-name-to-commands.yml-replacement.patch similarity index 100% rename from patches/api/0029-Add-sender-name-to-commands.yml-replacement.patch rename to patches/unapplied/api/0029-Add-sender-name-to-commands.yml-replacement.patch diff --git a/patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/unapplied/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch similarity index 100% rename from patches/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch rename to patches/unapplied/api/0030-Add-command-to-reload-permissions.yml-and-require-co.patch diff --git a/patches/api/0031-Custom-replacement-for-eaten-items.patch b/patches/unapplied/api/0031-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/api/0031-Custom-replacement-for-eaten-items.patch rename to patches/unapplied/api/0031-Custom-replacement-for-eaten-items.patch diff --git a/patches/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/api/0032-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/api/0033-EntityPathfindEvent.patch b/patches/unapplied/api/0033-EntityPathfindEvent.patch similarity index 100% rename from patches/api/0033-EntityPathfindEvent.patch rename to patches/unapplied/api/0033-EntityPathfindEvent.patch diff --git a/patches/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/unapplied/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch similarity index 100% rename from patches/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch rename to patches/unapplied/api/0034-Reduce-thread-synchronization-in-MetadataStoreBase.patch diff --git a/patches/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/unapplied/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch similarity index 100% rename from patches/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch rename to patches/unapplied/api/0035-Add-MetadataStoreBase.removeAll-Plugin.patch diff --git a/patches/api/0036-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/api/0036-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/api/0036-Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/api/0036-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/unapplied/api/0037-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/api/0038-Arrow-pickup-rule-API.patch b/patches/unapplied/api/0038-Arrow-pickup-rule-API.patch similarity index 100% rename from patches/api/0038-Arrow-pickup-rule-API.patch rename to patches/unapplied/api/0038-Arrow-pickup-rule-API.patch diff --git a/patches/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/api/0039-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/api/0040-LootTable-API.patch b/patches/unapplied/api/0040-LootTable-API.patch similarity index 100% rename from patches/api/0040-LootTable-API.patch rename to patches/unapplied/api/0040-LootTable-API.patch diff --git a/patches/api/0041-Add-EntityZapEvent.patch b/patches/unapplied/api/0041-Add-EntityZapEvent.patch similarity index 100% rename from patches/api/0041-Add-EntityZapEvent.patch rename to patches/unapplied/api/0041-Add-EntityZapEvent.patch diff --git a/patches/api/0042-Misc-Utils.patch b/patches/unapplied/api/0042-Misc-Utils.patch similarity index 100% rename from patches/api/0042-Misc-Utils.patch rename to patches/unapplied/api/0042-Misc-Utils.patch diff --git a/patches/api/0043-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/api/0043-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/api/0043-Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/api/0043-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/api/0044-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/api/0044-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/api/0044-Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/api/0044-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/api/0045-Add-ProjectileCollideEvent.patch b/patches/unapplied/api/0045-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/api/0045-Add-ProjectileCollideEvent.patch rename to patches/unapplied/api/0045-Add-ProjectileCollideEvent.patch diff --git a/patches/api/0046-Add-String-based-Action-Bar-API.patch b/patches/unapplied/api/0046-Add-String-based-Action-Bar-API.patch similarity index 100% rename from patches/api/0046-Add-String-based-Action-Bar-API.patch rename to patches/unapplied/api/0046-Add-String-based-Action-Bar-API.patch diff --git a/patches/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/unapplied/api/0047-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/api/0048-IllegalPacketEvent.patch b/patches/unapplied/api/0048-IllegalPacketEvent.patch similarity index 100% rename from patches/api/0048-IllegalPacketEvent.patch rename to patches/unapplied/api/0048-IllegalPacketEvent.patch diff --git a/patches/api/0049-Fireworks-API-s.patch b/patches/unapplied/api/0049-Fireworks-API-s.patch similarity index 100% rename from patches/api/0049-Fireworks-API-s.patch rename to patches/unapplied/api/0049-Fireworks-API-s.patch diff --git a/patches/api/0050-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/api/0050-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0050-PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/api/0050-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/api/0051-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/api/0052-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/unapplied/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch similarity index 100% rename from patches/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch rename to patches/unapplied/api/0053-Expose-WorldBorder-isInBounds-Location-check.patch diff --git a/patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/unapplied/api/0054-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/unapplied/api/0055-Fix-upstream-javadocs.patch similarity index 100% rename from patches/api/0055-Fix-upstream-javadocs.patch rename to patches/unapplied/api/0055-Fix-upstream-javadocs.patch diff --git a/patches/api/0056-Item-canEntityPickup.patch b/patches/unapplied/api/0056-Item-canEntityPickup.patch similarity index 100% rename from patches/api/0056-Item-canEntityPickup.patch rename to patches/unapplied/api/0056-Item-canEntityPickup.patch diff --git a/patches/api/0057-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/api/0057-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/api/0057-PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/api/0057-PlayerAttemptPickupItemEvent.patch diff --git a/patches/api/0058-Add-UnknownCommandEvent.patch b/patches/unapplied/api/0058-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/api/0058-Add-UnknownCommandEvent.patch rename to patches/unapplied/api/0058-Add-UnknownCommandEvent.patch diff --git a/patches/api/0059-Basic-PlayerProfile-API.patch b/patches/unapplied/api/0059-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/api/0059-Basic-PlayerProfile-API.patch rename to patches/unapplied/api/0059-Basic-PlayerProfile-API.patch diff --git a/patches/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/api/0060-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/api/0061-Shoulder-Entities-Release-API.patch b/patches/unapplied/api/0061-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/api/0061-Shoulder-Entities-Release-API.patch rename to patches/unapplied/api/0061-Shoulder-Entities-Release-API.patch diff --git a/patches/api/0062-Entity-fromMobSpawner.patch b/patches/unapplied/api/0062-Entity-fromMobSpawner.patch similarity index 100% rename from patches/api/0062-Entity-fromMobSpawner.patch rename to patches/unapplied/api/0062-Entity-fromMobSpawner.patch diff --git a/patches/api/0063-Profile-Lookup-Events.patch b/patches/unapplied/api/0063-Profile-Lookup-Events.patch similarity index 100% rename from patches/api/0063-Profile-Lookup-Events.patch rename to patches/unapplied/api/0063-Profile-Lookup-Events.patch diff --git a/patches/api/0064-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/api/0064-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/api/0064-Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/api/0064-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/api/0065-Add-getI18NDisplayName-API.patch b/patches/unapplied/api/0065-Add-getI18NDisplayName-API.patch similarity index 100% rename from patches/api/0065-Add-getI18NDisplayName-API.patch rename to patches/unapplied/api/0065-Add-getI18NDisplayName-API.patch diff --git a/patches/api/0066-ensureServerConversions-API.patch b/patches/unapplied/api/0066-ensureServerConversions-API.patch similarity index 100% rename from patches/api/0066-ensureServerConversions-API.patch rename to patches/unapplied/api/0066-ensureServerConversions-API.patch diff --git a/patches/api/0067-LivingEntity-setKiller.patch b/patches/unapplied/api/0067-LivingEntity-setKiller.patch similarity index 100% rename from patches/api/0067-LivingEntity-setKiller.patch rename to patches/unapplied/api/0067-LivingEntity-setKiller.patch diff --git a/patches/api/0068-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/api/0068-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/api/0068-ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/api/0068-ProfileWhitelistVerifyEvent.patch diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 100% rename from patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch rename to patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch diff --git a/patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/unapplied/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch similarity index 100% rename from patches/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch rename to patches/unapplied/api/0070-Handle-plugin-prefixes-in-implementation-logging-con.patch diff --git a/patches/api/0071-Add-PlayerJumpEvent.patch b/patches/unapplied/api/0071-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/api/0071-Add-PlayerJumpEvent.patch rename to patches/unapplied/api/0071-Add-PlayerJumpEvent.patch diff --git a/patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch similarity index 98% rename from patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch rename to patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch index 323ce99c80..0b46c57cfc 100644 --- a/patches/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch +++ b/patches/unapplied/api/0072-Add-workaround-for-plugins-modifying-the-parent-of-t.patch @@ -93,7 +93,7 @@ index 71c8d2345eef6895edb8d210553ec3cddd9c76d0..6d31f3a2569ae9c522a5e6cddd38ac8f /** diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 2f045068c34c7c007565b7d7a17b7a003a79f37b..805f2bef4a785cb9639afd40ef820452efd1b2cf 100644 +index 2d2fa6ce5200eb5c75a733f9f54f400113cc22b0..5c5aadc15c8198e0e79b4ac0f043a45720aef002 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -65,7 +65,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm diff --git a/patches/api/0073-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/api/0073-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/api/0073-Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/api/0073-Add-PlayerArmorChangeEvent.patch diff --git a/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/unapplied/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/api/0075-AsyncTabCompleteEvent.patch b/patches/unapplied/api/0075-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/api/0075-AsyncTabCompleteEvent.patch rename to patches/unapplied/api/0075-AsyncTabCompleteEvent.patch diff --git a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch rename to patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/api/0077-Display-warning-on-deprecated-recipe-API.patch b/patches/unapplied/api/0077-Display-warning-on-deprecated-recipe-API.patch similarity index 100% rename from patches/api/0077-Display-warning-on-deprecated-recipe-API.patch rename to patches/unapplied/api/0077-Display-warning-on-deprecated-recipe-API.patch diff --git a/patches/api/0078-PlayerPickupExperienceEvent.patch b/patches/unapplied/api/0078-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/api/0078-PlayerPickupExperienceEvent.patch rename to patches/unapplied/api/0078-PlayerPickupExperienceEvent.patch diff --git a/patches/api/0079-ExperienceOrbMergeEvent.patch b/patches/unapplied/api/0079-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/api/0079-ExperienceOrbMergeEvent.patch rename to patches/unapplied/api/0079-ExperienceOrbMergeEvent.patch diff --git a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/api/0080-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/api/0080-Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/api/0080-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/api/0081-PreCreatureSpawnEvent.patch b/patches/unapplied/api/0081-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/api/0081-PreCreatureSpawnEvent.patch rename to patches/unapplied/api/0081-PreCreatureSpawnEvent.patch diff --git a/patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/api/0082-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/api/0082-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/api/0082-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/api/0083-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/api/0083-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/api/0084-Fill-Profile-Property-Events.patch b/patches/unapplied/api/0084-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/api/0084-Fill-Profile-Property-Events.patch rename to patches/unapplied/api/0084-Fill-Profile-Property-Events.patch diff --git a/patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/api/0085-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/api/0085-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/api/0085-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/api/0086-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/api/0086-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/api/0086-Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/api/0086-Add-ArmorStand-Item-Meta.patch diff --git a/patches/api/0087-Optimize-Hoppers.patch b/patches/unapplied/api/0087-Optimize-Hoppers.patch similarity index 100% rename from patches/api/0087-Optimize-Hoppers.patch rename to patches/unapplied/api/0087-Optimize-Hoppers.patch diff --git a/patches/api/0088-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/api/0088-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/api/0088-Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/api/0088-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/api/0090-Add-extended-PaperServerListPingEvent.patch b/patches/unapplied/api/0090-Add-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0090-Add-extended-PaperServerListPingEvent.patch rename to patches/unapplied/api/0090-Add-extended-PaperServerListPingEvent.patch diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/unapplied/api/0091-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/api/0091-Player.setPlayerProfile-API.patch rename to patches/unapplied/api/0091-Player.setPlayerProfile-API.patch diff --git a/patches/api/0092-getPlayerUniqueId-API.patch b/patches/unapplied/api/0092-getPlayerUniqueId-API.patch similarity index 100% rename from patches/api/0092-getPlayerUniqueId-API.patch rename to patches/unapplied/api/0092-getPlayerUniqueId-API.patch diff --git a/patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/unapplied/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch rename to patches/unapplied/api/0093-Add-legacy-ping-support-to-PaperServerListPingEvent.patch diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/api/0094-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/api/0094-Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/api/0094-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/unapplied/api/0095-Add-Ban-Methods-to-Player-Objects.patch similarity index 100% rename from patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch rename to patches/unapplied/api/0095-Add-Ban-Methods-to-Player-Objects.patch diff --git a/patches/api/0096-EndermanEscapeEvent.patch b/patches/unapplied/api/0096-EndermanEscapeEvent.patch similarity index 100% rename from patches/api/0096-EndermanEscapeEvent.patch rename to patches/unapplied/api/0096-EndermanEscapeEvent.patch diff --git a/patches/api/0097-Enderman.teleportRandomly.patch b/patches/unapplied/api/0097-Enderman.teleportRandomly.patch similarity index 100% rename from patches/api/0097-Enderman.teleportRandomly.patch rename to patches/unapplied/api/0097-Enderman.teleportRandomly.patch diff --git a/patches/api/0098-Additional-world.getNearbyEntities-API-s.patch b/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch similarity index 100% rename from patches/api/0098-Additional-world.getNearbyEntities-API-s.patch rename to patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch diff --git a/patches/api/0099-Location.isChunkLoaded-API.patch b/patches/unapplied/api/0099-Location.isChunkLoaded-API.patch similarity index 100% rename from patches/api/0099-Location.isChunkLoaded-API.patch rename to patches/unapplied/api/0099-Location.isChunkLoaded-API.patch diff --git a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/api/0101-EndermanAttackPlayerEvent.patch b/patches/unapplied/api/0101-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/api/0101-EndermanAttackPlayerEvent.patch rename to patches/unapplied/api/0101-EndermanAttackPlayerEvent.patch diff --git a/patches/api/0102-WitchConsumePotionEvent.patch b/patches/unapplied/api/0102-WitchConsumePotionEvent.patch similarity index 100% rename from patches/api/0102-WitchConsumePotionEvent.patch rename to patches/unapplied/api/0102-WitchConsumePotionEvent.patch diff --git a/patches/api/0103-WitchThrowPotionEvent.patch b/patches/unapplied/api/0103-WitchThrowPotionEvent.patch similarity index 100% rename from patches/api/0103-WitchThrowPotionEvent.patch rename to patches/unapplied/api/0103-WitchThrowPotionEvent.patch diff --git a/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch b/patches/unapplied/api/0104-Location.toBlockLocation-toCenterLocation.patch similarity index 100% rename from patches/api/0104-Location.toBlockLocation-toCenterLocation.patch rename to patches/unapplied/api/0104-Location.toBlockLocation-toCenterLocation.patch diff --git a/patches/api/0105-PotionEffect-clone-methods.patch b/patches/unapplied/api/0105-PotionEffect-clone-methods.patch similarity index 100% rename from patches/api/0105-PotionEffect-clone-methods.patch rename to patches/unapplied/api/0105-PotionEffect-clone-methods.patch diff --git a/patches/api/0106-WitchReadyPotionEvent.patch b/patches/unapplied/api/0106-WitchReadyPotionEvent.patch similarity index 100% rename from patches/api/0106-WitchReadyPotionEvent.patch rename to patches/unapplied/api/0106-WitchReadyPotionEvent.patch diff --git a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/api/0107-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/api/0107-ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/api/0107-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/api/0108-Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/api/0108-Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/api/0109-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/api/0109-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/api/0109-Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/api/0109-Make-shield-blocking-delay-configurable.patch diff --git a/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/unapplied/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 100% rename from patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to patches/unapplied/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch diff --git a/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch b/patches/unapplied/api/0111-Add-getNearbyXXX-methods-to-Location.patch similarity index 100% rename from patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch rename to patches/unapplied/api/0111-Add-getNearbyXXX-methods-to-Location.patch diff --git a/patches/api/0112-PlayerReadyArrowEvent.patch b/patches/unapplied/api/0112-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/api/0112-PlayerReadyArrowEvent.patch rename to patches/unapplied/api/0112-PlayerReadyArrowEvent.patch diff --git a/patches/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/unapplied/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch similarity index 100% rename from patches/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch rename to patches/unapplied/api/0113-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch diff --git a/patches/api/0114-Expand-Explosions-API.patch b/patches/unapplied/api/0114-Expand-Explosions-API.patch similarity index 100% rename from patches/api/0114-Expand-Explosions-API.patch rename to patches/unapplied/api/0114-Expand-Explosions-API.patch diff --git a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/unapplied/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 100% rename from patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch rename to patches/unapplied/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch diff --git a/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/unapplied/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/api/0117-RangedEntity-API.patch b/patches/unapplied/api/0117-RangedEntity-API.patch similarity index 100% rename from patches/api/0117-RangedEntity-API.patch rename to patches/unapplied/api/0117-RangedEntity-API.patch diff --git a/patches/api/0118-Add-World.getEntity-UUID-API.patch b/patches/unapplied/api/0118-Add-World.getEntity-UUID-API.patch similarity index 100% rename from patches/api/0118-Add-World.getEntity-UUID-API.patch rename to patches/unapplied/api/0118-Add-World.getEntity-UUID-API.patch diff --git a/patches/api/0119-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/api/0119-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/api/0119-InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/api/0119-InventoryCloseEvent-Reason-API.patch diff --git a/patches/api/0120-Allow-setting-the-vex-s-summoner.patch b/patches/unapplied/api/0120-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from patches/api/0120-Allow-setting-the-vex-s-summoner.patch rename to patches/unapplied/api/0120-Allow-setting-the-vex-s-summoner.patch diff --git a/patches/api/0121-Entity-getChunk-API.patch b/patches/unapplied/api/0121-Entity-getChunk-API.patch similarity index 100% rename from patches/api/0121-Entity-getChunk-API.patch rename to patches/unapplied/api/0121-Entity-getChunk-API.patch diff --git a/patches/api/0122-EnderDragon-Events.patch b/patches/unapplied/api/0122-EnderDragon-Events.patch similarity index 100% rename from patches/api/0122-EnderDragon-Events.patch rename to patches/unapplied/api/0122-EnderDragon-Events.patch diff --git a/patches/api/0123-PlayerElytraBoostEvent.patch b/patches/unapplied/api/0123-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/api/0123-PlayerElytraBoostEvent.patch rename to patches/unapplied/api/0123-PlayerElytraBoostEvent.patch diff --git a/patches/api/0124-PlayerLaunchProjectileEvent.patch b/patches/unapplied/api/0124-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/api/0124-PlayerLaunchProjectileEvent.patch rename to patches/unapplied/api/0124-PlayerLaunchProjectileEvent.patch diff --git a/patches/api/0125-EntityTransformedEvent.patch b/patches/unapplied/api/0125-EntityTransformedEvent.patch similarity index 100% rename from patches/api/0125-EntityTransformedEvent.patch rename to patches/unapplied/api/0125-EntityTransformedEvent.patch diff --git a/patches/api/0126-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/api/0126-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/api/0126-Allow-disabling-armour-stand-ticking.patch rename to patches/unapplied/api/0126-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/api/0127-SkeletonHorse-Additions.patch b/patches/unapplied/api/0127-SkeletonHorse-Additions.patch similarity index 100% rename from patches/api/0127-SkeletonHorse-Additions.patch rename to patches/unapplied/api/0127-SkeletonHorse-Additions.patch diff --git a/patches/api/0128-Expand-Location-Manipulation-API.patch b/patches/unapplied/api/0128-Expand-Location-Manipulation-API.patch similarity index 100% rename from patches/api/0128-Expand-Location-Manipulation-API.patch rename to patches/unapplied/api/0128-Expand-Location-Manipulation-API.patch diff --git a/patches/api/0129-Expand-ArmorStand-API.patch b/patches/unapplied/api/0129-Expand-ArmorStand-API.patch similarity index 100% rename from patches/api/0129-Expand-ArmorStand-API.patch rename to patches/unapplied/api/0129-Expand-ArmorStand-API.patch diff --git a/patches/api/0130-AnvilDamageEvent.patch b/patches/unapplied/api/0130-AnvilDamageEvent.patch similarity index 100% rename from patches/api/0130-AnvilDamageEvent.patch rename to patches/unapplied/api/0130-AnvilDamageEvent.patch diff --git a/patches/api/0131-Add-TNTPrimeEvent.patch b/patches/unapplied/api/0131-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/api/0131-Add-TNTPrimeEvent.patch rename to patches/unapplied/api/0131-Add-TNTPrimeEvent.patch diff --git a/patches/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/unapplied/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 100% rename from patches/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/unapplied/api/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch diff --git a/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/unapplied/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/unapplied/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 100% rename from patches/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to patches/unapplied/api/0134-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch diff --git a/patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/unapplied/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 100% rename from patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to patches/unapplied/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch diff --git a/patches/api/0136-Slime-Pathfinder-Events.patch b/patches/unapplied/api/0136-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/api/0136-Slime-Pathfinder-Events.patch rename to patches/unapplied/api/0136-Slime-Pathfinder-Events.patch diff --git a/patches/api/0137-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/api/0137-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/api/0137-Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/api/0137-Add-PhantomPreSpawnEvent.patch diff --git a/patches/api/0138-Add-More-Creeper-API.patch b/patches/unapplied/api/0138-Add-More-Creeper-API.patch similarity index 100% rename from patches/api/0138-Add-More-Creeper-API.patch rename to patches/unapplied/api/0138-Add-More-Creeper-API.patch diff --git a/patches/api/0139-Inventory-removeItemAnySlot.patch b/patches/unapplied/api/0139-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/api/0139-Inventory-removeItemAnySlot.patch rename to patches/unapplied/api/0139-Inventory-removeItemAnySlot.patch diff --git a/patches/api/0140-isChunkGenerated-API.patch b/patches/unapplied/api/0140-isChunkGenerated-API.patch similarity index 100% rename from patches/api/0140-isChunkGenerated-API.patch rename to patches/unapplied/api/0140-isChunkGenerated-API.patch diff --git a/patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/unapplied/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch similarity index 100% rename from patches/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch rename to patches/unapplied/api/0141-Add-source-block-constructor-and-getChangedBlockData.patch diff --git a/patches/api/0142-Async-Chunks-API.patch b/patches/unapplied/api/0142-Async-Chunks-API.patch similarity index 100% rename from patches/api/0142-Async-Chunks-API.patch rename to patches/unapplied/api/0142-Async-Chunks-API.patch diff --git a/patches/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/api/0143-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/api/0144-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/api/0144-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/api/0145-Improve-death-events.patch b/patches/unapplied/api/0145-Improve-death-events.patch similarity index 100% rename from patches/api/0145-Improve-death-events.patch rename to patches/unapplied/api/0145-Improve-death-events.patch diff --git a/patches/api/0146-Add-Git-information-to-version-command-on-startup.patch b/patches/unapplied/api/0146-Add-Git-information-to-version-command-on-startup.patch similarity index 100% rename from patches/api/0146-Add-Git-information-to-version-command-on-startup.patch rename to patches/unapplied/api/0146-Add-Git-information-to-version-command-on-startup.patch diff --git a/patches/api/0147-Mob-Pathfinding-API.patch b/patches/unapplied/api/0147-Mob-Pathfinding-API.patch similarity index 100% rename from patches/api/0147-Mob-Pathfinding-API.patch rename to patches/unapplied/api/0147-Mob-Pathfinding-API.patch diff --git a/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/unapplied/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/unapplied/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/unapplied/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/unapplied/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/unapplied/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/api/0151-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/api/0151-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/api/0152-Material-API-additions.patch b/patches/unapplied/api/0152-Material-API-additions.patch similarity index 100% rename from patches/api/0152-Material-API-additions.patch rename to patches/unapplied/api/0152-Material-API-additions.patch diff --git a/patches/api/0153-Add-Material-Tags.patch b/patches/unapplied/api/0153-Add-Material-Tags.patch similarity index 100% rename from patches/api/0153-Add-Material-Tags.patch rename to patches/unapplied/api/0153-Add-Material-Tags.patch diff --git a/patches/api/0154-PreSpawnerSpawnEvent.patch b/patches/unapplied/api/0154-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0154-PreSpawnerSpawnEvent.patch rename to patches/unapplied/api/0154-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0155-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/api/0155-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/api/0155-Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/api/0155-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/api/0156-Add-sun-related-API.patch b/patches/unapplied/api/0156-Add-sun-related-API.patch similarity index 100% rename from patches/api/0156-Add-sun-related-API.patch rename to patches/unapplied/api/0156-Add-sun-related-API.patch diff --git a/patches/api/0157-Turtle-API.patch b/patches/unapplied/api/0157-Turtle-API.patch similarity index 100% rename from patches/api/0157-Turtle-API.patch rename to patches/unapplied/api/0157-Turtle-API.patch diff --git a/patches/api/0158-Add-spectator-target-events.patch b/patches/unapplied/api/0158-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0158-Add-spectator-target-events.patch rename to patches/unapplied/api/0158-Add-spectator-target-events.patch diff --git a/patches/api/0159-Add-more-Witch-API.patch b/patches/unapplied/api/0159-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0159-Add-more-Witch-API.patch rename to patches/unapplied/api/0159-Add-more-Witch-API.patch diff --git a/patches/api/0160-Make-the-default-permission-message-configurable.patch b/patches/unapplied/api/0160-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/api/0160-Make-the-default-permission-message-configurable.patch rename to patches/unapplied/api/0160-Make-the-default-permission-message-configurable.patch diff --git a/patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/unapplied/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/unapplied/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0162-Add-more-Zombie-API.patch b/patches/unapplied/api/0162-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0162-Add-more-Zombie-API.patch rename to patches/unapplied/api/0162-Add-more-Zombie-API.patch diff --git a/patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/unapplied/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/unapplied/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0164-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/api/0164-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0164-Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/api/0164-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/unapplied/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/unapplied/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0167-BlockDestroyEvent.patch b/patches/unapplied/api/0167-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0167-BlockDestroyEvent.patch rename to patches/unapplied/api/0167-BlockDestroyEvent.patch diff --git a/patches/api/0168-Add-WhitelistToggleEvent.patch b/patches/unapplied/api/0168-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0168-Add-WhitelistToggleEvent.patch rename to patches/unapplied/api/0168-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0169-Add-GS4-Query-event.patch b/patches/unapplied/api/0169-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0169-Add-GS4-Query-event.patch rename to patches/unapplied/api/0169-Add-GS4-Query-event.patch diff --git a/patches/api/0170-Add-PlayerPostRespawnEvent.patch b/patches/unapplied/api/0170-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0170-Add-PlayerPostRespawnEvent.patch rename to patches/unapplied/api/0170-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0171-Entity-getEntitySpawnReason.patch b/patches/unapplied/api/0171-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/api/0171-Entity-getEntitySpawnReason.patch rename to patches/unapplied/api/0171-Entity-getEntitySpawnReason.patch diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/unapplied/api/0172-Fix-Spigot-annotation-mistakes.patch similarity index 100% rename from patches/api/0172-Fix-Spigot-annotation-mistakes.patch rename to patches/unapplied/api/0172-Fix-Spigot-annotation-mistakes.patch diff --git a/patches/api/0173-Server-Tick-Events.patch b/patches/unapplied/api/0173-Server-Tick-Events.patch similarity index 100% rename from patches/api/0173-Server-Tick-Events.patch rename to patches/unapplied/api/0173-Server-Tick-Events.patch diff --git a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/api/0174-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/api/0174-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0175-Add-Heightmap-API.patch b/patches/unapplied/api/0175-Add-Heightmap-API.patch similarity index 100% rename from patches/api/0175-Add-Heightmap-API.patch rename to patches/unapplied/api/0175-Add-Heightmap-API.patch diff --git a/patches/api/0176-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/api/0176-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0176-Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/api/0176-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0177-Add-BlockSoundGroup-interface.patch b/patches/unapplied/api/0177-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0177-Add-BlockSoundGroup-interface.patch rename to patches/unapplied/api/0177-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/unapplied/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/unapplied/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0179-Increase-custom-payload-channel-message-size.patch b/patches/unapplied/api/0179-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/api/0179-Increase-custom-payload-channel-message-size.patch rename to patches/unapplied/api/0179-Increase-custom-payload-channel-message-size.patch diff --git a/patches/api/0180-Expose-the-internal-current-tick.patch b/patches/unapplied/api/0180-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/api/0180-Expose-the-internal-current-tick.patch rename to patches/unapplied/api/0180-Expose-the-internal-current-tick.patch diff --git a/patches/api/0181-Improve-Block-breakNaturally-API.patch b/patches/unapplied/api/0181-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/api/0181-Improve-Block-breakNaturally-API.patch rename to patches/unapplied/api/0181-Improve-Block-breakNaturally-API.patch diff --git a/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/api/0182-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/api/0182-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0183-Add-ThrownEggHatchEvent.patch b/patches/unapplied/api/0183-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0183-Add-ThrownEggHatchEvent.patch rename to patches/unapplied/api/0183-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0184-Entity-Jump-API.patch b/patches/unapplied/api/0184-Entity-Jump-API.patch similarity index 100% rename from patches/api/0184-Entity-Jump-API.patch rename to patches/unapplied/api/0184-Entity-Jump-API.patch diff --git a/patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/api/0185-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/api/0185-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0186-Add-tick-times-API.patch b/patches/unapplied/api/0186-Add-tick-times-API.patch similarity index 100% rename from patches/api/0186-Add-tick-times-API.patch rename to patches/unapplied/api/0186-Add-tick-times-API.patch diff --git a/patches/api/0187-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/api/0187-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/api/0187-Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/api/0187-Expose-MinecraftServer-isRunning.patch diff --git a/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/api/0189-Add-Player-Client-Options-API.patch b/patches/unapplied/api/0189-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0189-Add-Player-Client-Options-API.patch rename to patches/unapplied/api/0189-Add-Player-Client-Options-API.patch diff --git a/patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/unapplied/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/unapplied/api/0191-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/api/0192-Add-item-slot-convenience-methods.patch b/patches/unapplied/api/0192-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0192-Add-item-slot-convenience-methods.patch rename to patches/unapplied/api/0192-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0193-Villager-Restocks-API.patch b/patches/unapplied/api/0193-Villager-Restocks-API.patch similarity index 100% rename from patches/api/0193-Villager-Restocks-API.patch rename to patches/unapplied/api/0193-Villager-Restocks-API.patch diff --git a/patches/api/0194-Expose-game-version.patch b/patches/unapplied/api/0194-Expose-game-version.patch similarity index 100% rename from patches/api/0194-Expose-game-version.patch rename to patches/unapplied/api/0194-Expose-game-version.patch diff --git a/patches/api/0195-Add-Mob-Goal-API.patch b/patches/unapplied/api/0195-Add-Mob-Goal-API.patch similarity index 100% rename from patches/api/0195-Add-Mob-Goal-API.patch rename to patches/unapplied/api/0195-Add-Mob-Goal-API.patch diff --git a/patches/api/0196-Add-villager-reputation-API.patch b/patches/unapplied/api/0196-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0196-Add-villager-reputation-API.patch rename to patches/unapplied/api/0196-Add-villager-reputation-API.patch diff --git a/patches/api/0197-Spawn-Reason-API.patch b/patches/unapplied/api/0197-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0197-Spawn-Reason-API.patch rename to patches/unapplied/api/0197-Spawn-Reason-API.patch diff --git a/patches/api/0198-Potential-bed-API.patch b/patches/unapplied/api/0198-Potential-bed-API.patch similarity index 100% rename from patches/api/0198-Potential-bed-API.patch rename to patches/unapplied/api/0198-Potential-bed-API.patch diff --git a/patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/api/0199-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/api/0199-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0200-Improve-Arrow-API.patch b/patches/unapplied/api/0200-Improve-Arrow-API.patch similarity index 100% rename from patches/api/0200-Improve-Arrow-API.patch rename to patches/unapplied/api/0200-Improve-Arrow-API.patch diff --git a/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0202-Support-components-in-ItemMeta.patch b/patches/unapplied/api/0202-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/api/0202-Support-components-in-ItemMeta.patch rename to patches/unapplied/api/0202-Support-components-in-ItemMeta.patch diff --git a/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/unapplied/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/unapplied/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0204-Add-entity-liquid-API.patch b/patches/unapplied/api/0204-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0204-Add-entity-liquid-API.patch rename to patches/unapplied/api/0204-Add-entity-liquid-API.patch diff --git a/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/unapplied/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/unapplied/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0206-Brand-support.patch b/patches/unapplied/api/0206-Brand-support.patch similarity index 100% rename from patches/api/0206-Brand-support.patch rename to patches/unapplied/api/0206-Brand-support.patch diff --git a/patches/api/0207-Support-hex-colors-in-getLastColors.patch b/patches/unapplied/api/0207-Support-hex-colors-in-getLastColors.patch similarity index 100% rename from patches/api/0207-Support-hex-colors-in-getLastColors.patch rename to patches/unapplied/api/0207-Support-hex-colors-in-getLastColors.patch diff --git a/patches/api/0208-Add-setMaxPlayers-API.patch b/patches/unapplied/api/0208-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/api/0208-Add-setMaxPlayers-API.patch rename to patches/unapplied/api/0208-Add-setMaxPlayers-API.patch diff --git a/patches/api/0209-Add-BellRingEvent.patch b/patches/unapplied/api/0209-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0209-Add-BellRingEvent.patch rename to patches/unapplied/api/0209-Add-BellRingEvent.patch diff --git a/patches/api/0210-Add-moon-phase-API.patch b/patches/unapplied/api/0210-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0210-Add-moon-phase-API.patch rename to patches/unapplied/api/0210-Add-moon-phase-API.patch diff --git a/patches/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0212-Add-more-Evoker-API.patch b/patches/unapplied/api/0212-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0212-Add-more-Evoker-API.patch rename to patches/unapplied/api/0212-Add-more-Evoker-API.patch diff --git a/patches/api/0213-Add-methods-to-get-translation-keys.patch b/patches/unapplied/api/0213-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/api/0213-Add-methods-to-get-translation-keys.patch rename to patches/unapplied/api/0213-Add-methods-to-get-translation-keys.patch diff --git a/patches/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0215-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/api/0215-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0215-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/api/0215-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0217-Entity-isTicking.patch b/patches/unapplied/api/0217-Entity-isTicking.patch similarity index 100% rename from patches/api/0217-Entity-isTicking.patch rename to patches/unapplied/api/0217-Entity-isTicking.patch diff --git a/patches/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/unapplied/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch similarity index 100% rename from patches/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch rename to patches/unapplied/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch diff --git a/patches/api/0219-Villager-resetOffers.patch b/patches/unapplied/api/0219-Villager-resetOffers.patch similarity index 100% rename from patches/api/0219-Villager-resetOffers.patch rename to patches/unapplied/api/0219-Villager-resetOffers.patch diff --git a/patches/api/0220-Player-elytra-boost-API.patch b/patches/unapplied/api/0220-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0220-Player-elytra-boost-API.patch rename to patches/unapplied/api/0220-Player-elytra-boost-API.patch diff --git a/patches/api/0221-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/api/0221-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0221-Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/api/0221-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0222-Add-ignore-discounts-API.patch b/patches/unapplied/api/0222-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0222-Add-ignore-discounts-API.patch rename to patches/unapplied/api/0222-Add-ignore-discounts-API.patch diff --git a/patches/api/0223-Item-no-age-no-player-pickup.patch b/patches/unapplied/api/0223-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0223-Item-no-age-no-player-pickup.patch rename to patches/unapplied/api/0223-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0224-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/api/0224-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0224-Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/api/0224-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0225-Add-API-for-quit-reason.patch b/patches/unapplied/api/0225-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0225-Add-API-for-quit-reason.patch rename to patches/unapplied/api/0225-Add-API-for-quit-reason.patch diff --git a/patches/api/0226-Add-Destroy-Speed-API.patch b/patches/unapplied/api/0226-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0226-Add-Destroy-Speed-API.patch rename to patches/unapplied/api/0226-Add-Destroy-Speed-API.patch diff --git a/patches/api/0227-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/api/0227-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0227-Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/api/0227-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0228-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/api/0228-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0228-Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/api/0228-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0229-More-lightning-API.patch b/patches/unapplied/api/0229-More-lightning-API.patch similarity index 100% rename from patches/api/0229-More-lightning-API.patch rename to patches/unapplied/api/0229-More-lightning-API.patch diff --git a/patches/api/0230-Add-PlayerShearBlockEvent.patch b/patches/unapplied/api/0230-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0230-Add-PlayerShearBlockEvent.patch rename to patches/unapplied/api/0230-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0231-Enable-multi-release-plugin-jars.patch b/patches/unapplied/api/0231-Enable-multi-release-plugin-jars.patch similarity index 92% rename from patches/api/0231-Enable-multi-release-plugin-jars.patch rename to patches/unapplied/api/0231-Enable-multi-release-plugin-jars.patch index 0cb56eea52..2124a31273 100644 --- a/patches/api/0231-Enable-multi-release-plugin-jars.patch +++ b/patches/unapplied/api/0231-Enable-multi-release-plugin-jars.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Enable multi-release plugin jars diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 805f2bef4a785cb9639afd40ef820452efd1b2cf..caffe498ef5abf09944f846bf5a958b10de514df 100644 +index 5c5aadc15c8198e0e79b4ac0f043a45720aef002..942b313d9cee8abc7a5c9948e9e94d4d30741434 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -60,7 +60,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm diff --git a/patches/api/0232-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/api/0232-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0232-Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/api/0232-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0233-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/api/0233-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0233-Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/api/0233-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0235-Added-PlayerTradeEvent.patch b/patches/unapplied/api/0235-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0235-Added-PlayerTradeEvent.patch rename to patches/unapplied/api/0235-Added-PlayerTradeEvent.patch diff --git a/patches/api/0236-Add-TargetHitEvent-API.patch b/patches/unapplied/api/0236-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0236-Add-TargetHitEvent-API.patch rename to patches/unapplied/api/0236-Add-TargetHitEvent-API.patch diff --git a/patches/api/0237-Additional-Block-Material-API-s.patch b/patches/unapplied/api/0237-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0237-Additional-Block-Material-API-s.patch rename to patches/unapplied/api/0237-Additional-Block-Material-API-s.patch diff --git a/patches/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/unapplied/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/unapplied/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0239-Add-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/api/0239-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0239-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/api/0239-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0240-Zombie-API-breaking-doors.patch b/patches/unapplied/api/0240-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0240-Zombie-API-breaking-doors.patch rename to patches/unapplied/api/0240-Zombie-API-breaking-doors.patch diff --git a/patches/api/0241-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/api/0241-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0241-Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/api/0241-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0242-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/api/0242-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0242-Added-WorldGameRuleChangeEvent.patch rename to patches/unapplied/api/0242-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0243-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/api/0243-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0243-Added-ServerResourcesReloadedEvent.patch rename to patches/unapplied/api/0243-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0244-Add-BlockFailedDispenseEvent.patch b/patches/unapplied/api/0244-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0244-Add-BlockFailedDispenseEvent.patch rename to patches/unapplied/api/0244-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0245-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/api/0245-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0245-Added-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/api/0245-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0246-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/api/0246-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0246-Added-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/api/0246-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/unapplied/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/unapplied/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0248-Add-sendOpLevel-API.patch b/patches/unapplied/api/0248-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0248-Add-sendOpLevel-API.patch rename to patches/unapplied/api/0248-Add-sendOpLevel-API.patch diff --git a/patches/api/0249-Add-PaperRegistry.patch b/patches/unapplied/api/0249-Add-PaperRegistry.patch similarity index 100% rename from patches/api/0249-Add-PaperRegistry.patch rename to patches/unapplied/api/0249-Add-PaperRegistry.patch diff --git a/patches/api/0250-Add-StructuresLocateEvent.patch b/patches/unapplied/api/0250-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0250-Add-StructuresLocateEvent.patch rename to patches/unapplied/api/0250-Add-StructuresLocateEvent.patch diff --git a/patches/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/api/0252-Add-BlockPreDispenseEvent.patch b/patches/unapplied/api/0252-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0252-Add-BlockPreDispenseEvent.patch rename to patches/unapplied/api/0252-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0253-Added-missing-vanilla-tags.patch b/patches/unapplied/api/0253-Added-missing-vanilla-tags.patch similarity index 100% rename from patches/api/0253-Added-missing-vanilla-tags.patch rename to patches/unapplied/api/0253-Added-missing-vanilla-tags.patch diff --git a/patches/api/0254-Added-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/api/0254-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0254-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/api/0254-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/unapplied/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0257-add-DragonEggFormEvent.patch b/patches/unapplied/api/0257-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0257-add-DragonEggFormEvent.patch rename to patches/unapplied/api/0257-add-DragonEggFormEvent.patch diff --git a/patches/api/0258-EntityMoveEvent.patch b/patches/unapplied/api/0258-EntityMoveEvent.patch similarity index 100% rename from patches/api/0258-EntityMoveEvent.patch rename to patches/unapplied/api/0258-EntityMoveEvent.patch diff --git a/patches/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0261-living-entity-allow-attribute-registration.patch b/patches/unapplied/api/0261-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0261-living-entity-allow-attribute-registration.patch rename to patches/unapplied/api/0261-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0262-Add-missing-effects.patch b/patches/unapplied/api/0262-Add-missing-effects.patch similarity index 100% rename from patches/api/0262-Add-missing-effects.patch rename to patches/unapplied/api/0262-Add-missing-effects.patch diff --git a/patches/api/0263-Expose-Tracked-Players.patch b/patches/unapplied/api/0263-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0263-Expose-Tracked-Players.patch rename to patches/unapplied/api/0263-Expose-Tracked-Players.patch diff --git a/patches/api/0264-Cache-the-result-of-Material-isBlock.patch b/patches/unapplied/api/0264-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0264-Cache-the-result-of-Material-isBlock.patch rename to patches/unapplied/api/0264-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0265-Add-worldborder-events.patch b/patches/unapplied/api/0265-Add-worldborder-events.patch similarity index 100% rename from patches/api/0265-Add-worldborder-events.patch rename to patches/unapplied/api/0265-Add-worldborder-events.patch diff --git a/patches/api/0266-added-PlayerNameEntityEvent.patch b/patches/unapplied/api/0266-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0266-added-PlayerNameEntityEvent.patch rename to patches/unapplied/api/0266-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0267-Add-recipe-to-cook-events.patch b/patches/unapplied/api/0267-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0267-Add-recipe-to-cook-events.patch rename to patches/unapplied/api/0267-Add-recipe-to-cook-events.patch diff --git a/patches/api/0268-Add-Block-isValidTool.patch b/patches/unapplied/api/0268-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0268-Add-Block-isValidTool.patch rename to patches/unapplied/api/0268-Add-Block-isValidTool.patch diff --git a/patches/api/0269-Expand-world-key-API.patch b/patches/unapplied/api/0269-Expand-world-key-API.patch similarity index 100% rename from patches/api/0269-Expand-world-key-API.patch rename to patches/unapplied/api/0269-Expand-world-key-API.patch diff --git a/patches/api/0270-Item-Rarity-API.patch b/patches/unapplied/api/0270-Item-Rarity-API.patch similarity index 100% rename from patches/api/0270-Item-Rarity-API.patch rename to patches/unapplied/api/0270-Item-Rarity-API.patch diff --git a/patches/api/0271-Expose-protocol-version.patch b/patches/unapplied/api/0271-Expose-protocol-version.patch similarity index 100% rename from patches/api/0271-Expose-protocol-version.patch rename to patches/unapplied/api/0271-Expose-protocol-version.patch diff --git a/patches/api/0272-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/api/0272-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0272-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/api/0272-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0275-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/api/0275-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0275-Added-PlayerDeepSleepEvent.patch rename to patches/unapplied/api/0275-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0276-More-World-API.patch b/patches/unapplied/api/0276-More-World-API.patch similarity index 100% rename from patches/api/0276-More-World-API.patch rename to patches/unapplied/api/0276-More-World-API.patch diff --git a/patches/api/0277-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/api/0277-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0277-Added-PlayerBedFailEnterEvent.patch rename to patches/unapplied/api/0277-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0278-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/api/0278-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0278-Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/api/0278-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0279-PlayerMoveEvent-Improvements.patch b/patches/unapplied/api/0279-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0279-PlayerMoveEvent-Improvements.patch rename to patches/unapplied/api/0279-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/unapplied/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0281-Add-more-WanderingTrader-API.patch b/patches/unapplied/api/0281-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0281-Add-more-WanderingTrader-API.patch rename to patches/unapplied/api/0281-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0282-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/api/0282-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0282-Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/api/0282-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0285-Inventory-close.patch b/patches/unapplied/api/0285-Inventory-close.patch similarity index 100% rename from patches/api/0285-Inventory-close.patch rename to patches/unapplied/api/0285-Inventory-close.patch diff --git a/patches/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0287-Add-basic-Datapack-API.patch b/patches/unapplied/api/0287-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0287-Add-basic-Datapack-API.patch rename to patches/unapplied/api/0287-Add-basic-Datapack-API.patch diff --git a/patches/api/0288-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/api/0288-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0288-additions-to-PlayerGameModeChangeEvent.patch rename to patches/unapplied/api/0288-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0289-ItemStack-repair-check-API.patch b/patches/unapplied/api/0289-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0289-ItemStack-repair-check-API.patch rename to patches/unapplied/api/0289-ItemStack-repair-check-API.patch diff --git a/patches/api/0290-More-Enchantment-API.patch b/patches/unapplied/api/0290-More-Enchantment-API.patch similarity index 100% rename from patches/api/0290-More-Enchantment-API.patch rename to patches/unapplied/api/0290-More-Enchantment-API.patch diff --git a/patches/api/0291-Add-Mob-lookAt-API.patch b/patches/unapplied/api/0291-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0291-Add-Mob-lookAt-API.patch rename to patches/unapplied/api/0291-Add-Mob-lookAt-API.patch diff --git a/patches/api/0292-ItemStack-editMeta.patch b/patches/unapplied/api/0292-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0292-ItemStack-editMeta.patch rename to patches/unapplied/api/0292-ItemStack-editMeta.patch diff --git a/patches/api/0293-Add-EntityInsideBlockEvent.patch b/patches/unapplied/api/0293-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0293-Add-EntityInsideBlockEvent.patch rename to patches/unapplied/api/0293-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0294-Attributes-API-for-item-defaults.patch b/patches/unapplied/api/0294-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0294-Attributes-API-for-item-defaults.patch rename to patches/unapplied/api/0294-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0296-More-Lidded-Block-API.patch b/patches/unapplied/api/0296-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0296-More-Lidded-Block-API.patch rename to patches/unapplied/api/0296-More-Lidded-Block-API.patch diff --git a/patches/api/0297-Add-PlayerKickEvent-causes.patch b/patches/unapplied/api/0297-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0297-Add-PlayerKickEvent-causes.patch rename to patches/unapplied/api/0297-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0298-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/api/0298-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0298-Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/api/0298-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0299-Add-BellRevealRaiderEvent.patch b/patches/unapplied/api/0299-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0299-Add-BellRevealRaiderEvent.patch rename to patches/unapplied/api/0299-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0300-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/api/0300-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0300-Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/api/0300-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0301-Add-more-line-of-sight-methods.patch b/patches/unapplied/api/0301-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0301-Add-more-line-of-sight-methods.patch rename to patches/unapplied/api/0301-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0302-Add-WaterBottleSplashEvent.patch b/patches/unapplied/api/0302-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0302-Add-WaterBottleSplashEvent.patch rename to patches/unapplied/api/0302-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0303-Add-more-LimitedRegion-API.patch b/patches/unapplied/api/0303-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0303-Add-more-LimitedRegion-API.patch rename to patches/unapplied/api/0303-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0304-Missing-Entity-Behavior-API.patch b/patches/unapplied/api/0304-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/api/0304-Missing-Entity-Behavior-API.patch rename to patches/unapplied/api/0304-Missing-Entity-Behavior-API.patch diff --git a/patches/api/0305-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/api/0305-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0305-Adds-PlayerArmSwingEvent.patch rename to patches/unapplied/api/0305-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0306-Add-PlayerSignCommandPreprocessEvent.patch b/patches/unapplied/api/0306-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0306-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/unapplied/api/0306-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0307-fix-empty-array-elements-in-command-arguments.patch b/patches/unapplied/api/0307-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0307-fix-empty-array-elements-in-command-arguments.patch rename to patches/unapplied/api/0307-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0308-Stinger-API.patch b/patches/unapplied/api/0308-Stinger-API.patch similarity index 100% rename from patches/api/0308-Stinger-API.patch rename to patches/unapplied/api/0308-Stinger-API.patch diff --git a/patches/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 93% rename from patches/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch index fc55c97c46..795ba4e98d 100644 --- a/patches/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch +++ b/patches/unapplied/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rewrite LogEvents to contain the source jars in stack traces diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index caffe498ef5abf09944f846bf5a958b10de514df..b3429d739c74d8b6b692a47ab49b0f0de1e5ea8f 100644 +index 942b313d9cee8abc7a5c9948e9e94d4d30741434..a22b47d452cca95fdd5e468ef61a7f9347cc4b98 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -54,7 +54,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm diff --git a/patches/api/0310-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/api/0310-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0310-Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/api/0310-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0311-Added-EntityDamageItemEvent.patch b/patches/unapplied/api/0311-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0311-Added-EntityDamageItemEvent.patch rename to patches/unapplied/api/0311-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0312-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/api/0312-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0312-Make-EntityUnleashEvent-cancellable.patch rename to patches/unapplied/api/0312-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0313-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/api/0313-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0313-Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/api/0313-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0314-Add-BlockBreakBlockEvent.patch b/patches/unapplied/api/0314-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0314-Add-BlockBreakBlockEvent.patch rename to patches/unapplied/api/0314-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0315-Add-helpers-for-left-right-click-to-Action.patch b/patches/unapplied/api/0315-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0315-Add-helpers-for-left-right-click-to-Action.patch rename to patches/unapplied/api/0315-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0317-More-CommandBlock-API.patch b/patches/unapplied/api/0317-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0317-More-CommandBlock-API.patch rename to patches/unapplied/api/0317-More-CommandBlock-API.patch diff --git a/patches/api/0318-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/api/0318-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0318-Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/api/0318-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0319-add-back-EntityPortalExitEvent.patch b/patches/unapplied/api/0319-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0319-add-back-EntityPortalExitEvent.patch rename to patches/unapplied/api/0319-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0321-Get-entity-default-attributes.patch b/patches/unapplied/api/0321-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0321-Get-entity-default-attributes.patch rename to patches/unapplied/api/0321-Get-entity-default-attributes.patch diff --git a/patches/api/0322-Left-handed-API.patch b/patches/unapplied/api/0322-Left-handed-API.patch similarity index 100% rename from patches/api/0322-Left-handed-API.patch rename to patches/unapplied/api/0322-Left-handed-API.patch diff --git a/patches/api/0323-Add-more-advancement-API.patch b/patches/unapplied/api/0323-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0323-Add-more-advancement-API.patch rename to patches/unapplied/api/0323-Add-more-advancement-API.patch diff --git a/patches/api/0324-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/api/0324-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/api/0324-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/api/0324-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/api/0325-Add-critical-damage-API.patch b/patches/unapplied/api/0325-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0325-Add-critical-damage-API.patch rename to patches/unapplied/api/0325-Add-critical-damage-API.patch diff --git a/patches/api/0326-Fix-issues-with-mob-conversion.patch b/patches/unapplied/api/0326-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0326-Fix-issues-with-mob-conversion.patch rename to patches/unapplied/api/0326-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0327-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/api/0327-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0327-Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/api/0327-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0328-Goat-ram-API.patch b/patches/unapplied/api/0328-Goat-ram-API.patch similarity index 100% rename from patches/api/0328-Goat-ram-API.patch rename to patches/unapplied/api/0328-Goat-ram-API.patch diff --git a/patches/api/0329-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/api/0329-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0329-Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/api/0329-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0330-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/api/0330-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/api/0330-Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/api/0330-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/api/0331-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/api/0331-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0331-Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/api/0331-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0332-Add-player-health-update-API.patch b/patches/unapplied/api/0332-Add-player-health-update-API.patch similarity index 100% rename from patches/api/0332-Add-player-health-update-API.patch rename to patches/unapplied/api/0332-Add-player-health-update-API.patch diff --git a/patches/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0334-Add-more-Campfire-API.patch b/patches/unapplied/api/0334-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0334-Add-more-Campfire-API.patch rename to patches/unapplied/api/0334-Add-more-Campfire-API.patch diff --git a/patches/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/unapplied/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch similarity index 100% rename from patches/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch rename to patches/unapplied/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch diff --git a/patches/api/0336-Improve-scoreboard-entries.patch b/patches/unapplied/api/0336-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0336-Improve-scoreboard-entries.patch rename to patches/unapplied/api/0336-Improve-scoreboard-entries.patch diff --git a/patches/api/0337-Entity-powdered-snow-API.patch b/patches/unapplied/api/0337-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0337-Entity-powdered-snow-API.patch rename to patches/unapplied/api/0337-Entity-powdered-snow-API.patch diff --git a/patches/api/0338-Add-API-for-item-entity-health.patch b/patches/unapplied/api/0338-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0338-Add-API-for-item-entity-health.patch rename to patches/unapplied/api/0338-Add-API-for-item-entity-health.patch diff --git a/patches/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0340-Bucketable-API.patch b/patches/unapplied/api/0340-Bucketable-API.patch similarity index 100% rename from patches/api/0340-Bucketable-API.patch rename to patches/unapplied/api/0340-Bucketable-API.patch diff --git a/patches/api/0341-System-prop-for-default-config-comment-parsing.patch b/patches/unapplied/api/0341-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0341-System-prop-for-default-config-comment-parsing.patch rename to patches/unapplied/api/0341-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/unapplied/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/api/0344-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/api/0344-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0344-Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/api/0344-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0346-Warn-on-strange-EventHandler-return-types.patch b/patches/unapplied/api/0346-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0346-Warn-on-strange-EventHandler-return-types.patch rename to patches/unapplied/api/0346-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0347-Multi-Block-Change-API.patch b/patches/unapplied/api/0347-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0347-Multi-Block-Change-API.patch rename to patches/unapplied/api/0347-Multi-Block-Change-API.patch diff --git a/patches/api/0348-Fix-NotePlayEvent.patch b/patches/unapplied/api/0348-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0348-Fix-NotePlayEvent.patch rename to patches/unapplied/api/0348-Fix-NotePlayEvent.patch diff --git a/patches/api/0349-Freeze-Tick-Lock-API.patch b/patches/unapplied/api/0349-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0349-Freeze-Tick-Lock-API.patch rename to patches/unapplied/api/0349-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0350-Dolphin-API.patch b/patches/unapplied/api/0350-Dolphin-API.patch similarity index 100% rename from patches/api/0350-Dolphin-API.patch rename to patches/unapplied/api/0350-Dolphin-API.patch diff --git a/patches/api/0351-More-PotionEffectType-API.patch b/patches/unapplied/api/0351-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0351-More-PotionEffectType-API.patch rename to patches/unapplied/api/0351-More-PotionEffectType-API.patch diff --git a/patches/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0353-Implement-regenerateChunk.patch b/patches/unapplied/api/0353-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0353-Implement-regenerateChunk.patch rename to patches/unapplied/api/0353-Implement-regenerateChunk.patch diff --git a/patches/api/0354-Add-GameEvent-tags.patch b/patches/unapplied/api/0354-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0354-Add-GameEvent-tags.patch rename to patches/unapplied/api/0354-Add-GameEvent-tags.patch diff --git a/patches/api/0355-Furnace-RecipesUsed-API.patch b/patches/unapplied/api/0355-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0355-Furnace-RecipesUsed-API.patch rename to patches/unapplied/api/0355-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0356-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/api/0356-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0356-Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/api/0356-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0357-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/api/0357-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0357-Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/api/0357-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0358-Custom-Potion-Mixes.patch b/patches/unapplied/api/0358-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0358-Custom-Potion-Mixes.patch rename to patches/unapplied/api/0358-Custom-Potion-Mixes.patch diff --git a/patches/api/0359-Expose-furnace-minecart-push-values.patch b/patches/unapplied/api/0359-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0359-Expose-furnace-minecart-push-values.patch rename to patches/unapplied/api/0359-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0360-More-Projectile-API.patch b/patches/unapplied/api/0360-More-Projectile-API.patch similarity index 100% rename from patches/api/0360-More-Projectile-API.patch rename to patches/unapplied/api/0360-More-Projectile-API.patch diff --git a/patches/api/0361-Add-getComputedBiome-API.patch b/patches/unapplied/api/0361-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0361-Add-getComputedBiome-API.patch rename to patches/unapplied/api/0361-Add-getComputedBiome-API.patch diff --git a/patches/api/0362-Add-enchantWithLevels-API.patch b/patches/unapplied/api/0362-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0362-Add-enchantWithLevels-API.patch rename to patches/unapplied/api/0362-Add-enchantWithLevels-API.patch diff --git a/patches/api/0363-Add-TameableDeathMessageEvent.patch b/patches/unapplied/api/0363-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0363-Add-TameableDeathMessageEvent.patch rename to patches/unapplied/api/0363-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/unapplied/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/unapplied/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/unapplied/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0366-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/api/0366-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0366-WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/api/0366-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0368-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/api/0368-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0368-Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/api/0368-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0369-FallingBlock-auto-expire-setting.patch b/patches/unapplied/api/0369-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/api/0369-FallingBlock-auto-expire-setting.patch rename to patches/unapplied/api/0369-FallingBlock-auto-expire-setting.patch diff --git a/patches/api/0370-Keyed-Cat-Type.patch b/patches/unapplied/api/0370-Keyed-Cat-Type.patch similarity index 100% rename from patches/api/0370-Keyed-Cat-Type.patch rename to patches/unapplied/api/0370-Keyed-Cat-Type.patch diff --git a/patches/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/unapplied/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/unapplied/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0372-Add-WardenAngerChangeEvent.patch b/patches/unapplied/api/0372-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0372-Add-WardenAngerChangeEvent.patch rename to patches/unapplied/api/0372-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0373-Nameable-Banner-API.patch b/patches/unapplied/api/0373-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0373-Nameable-Banner-API.patch rename to patches/unapplied/api/0373-Nameable-Banner-API.patch diff --git a/patches/api/0374-Add-Player-getFishHook.patch b/patches/unapplied/api/0374-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0374-Add-Player-getFishHook.patch rename to patches/unapplied/api/0374-Add-Player-getFishHook.patch diff --git a/patches/api/0375-More-Teleport-API.patch b/patches/unapplied/api/0375-More-Teleport-API.patch similarity index 100% rename from patches/api/0375-More-Teleport-API.patch rename to patches/unapplied/api/0375-More-Teleport-API.patch diff --git a/patches/api/0376-Add-EntityPortalReadyEvent.patch b/patches/unapplied/api/0376-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0376-Add-EntityPortalReadyEvent.patch rename to patches/unapplied/api/0376-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0377-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/api/0377-Custom-Chat-Completion-Suggestions-API.patch similarity index 93% rename from patches/api/0377-Custom-Chat-Completion-Suggestions-API.patch rename to patches/unapplied/api/0377-Custom-Chat-Completion-Suggestions-API.patch index bab0808013..fbfa26a4a3 100644 --- a/patches/api/0377-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/unapplied/api/0377-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7c9e61e8a85b06561b1b2d5dac32b92eade94205..529d07aa4581b8ab036fab5e93c2179c860efc0c 100644 +index 7b239b001288e773920195f3602b3f7103f80884..5c2705fc7fbb28d1ec0c7711295aff7efa5bc3ba 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2626,6 +2626,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0378-Collision-API.patch b/patches/unapplied/api/0378-Collision-API.patch similarity index 100% rename from patches/api/0378-Collision-API.patch rename to patches/unapplied/api/0378-Collision-API.patch diff --git a/patches/api/0379-Block-Ticking-API.patch b/patches/unapplied/api/0379-Block-Ticking-API.patch similarity index 100% rename from patches/api/0379-Block-Ticking-API.patch rename to patches/unapplied/api/0379-Block-Ticking-API.patch diff --git a/patches/api/0380-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/api/0380-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0380-Add-NamespacedKey-biome-methods.patch rename to patches/unapplied/api/0380-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/unapplied/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 95% rename from patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/unapplied/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch index 655e7e4ee8..6e1f315538 100644 --- a/patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch +++ b/patches/unapplied/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 529d07aa4581b8ab036fab5e93c2179c860efc0c..a6ad21303a03f7a09707ed28ab9e24443f3a62bf 100644 +index 5c2705fc7fbb28d1ec0c7711295aff7efa5bc3ba..8ad4b7b85c86259b3ba415cea2e398403bd91ffe 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -638,7 +638,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0382-Also-load-resources-from-LibraryLoader.patch b/patches/unapplied/api/0382-Also-load-resources-from-LibraryLoader.patch similarity index 95% rename from patches/api/0382-Also-load-resources-from-LibraryLoader.patch rename to patches/unapplied/api/0382-Also-load-resources-from-LibraryLoader.patch index e007a908a8..bf34d7318c 100644 --- a/patches/api/0382-Also-load-resources-from-LibraryLoader.patch +++ b/patches/unapplied/api/0382-Also-load-resources-from-LibraryLoader.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Also load resources from LibraryLoader diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index b3429d739c74d8b6b692a47ab49b0f0de1e5ea8f..526d313d0922c0c1ce9fbfad14e0bfa1fe86caf2 100644 +index a22b47d452cca95fdd5e468ef61a7f9347cc4b98..86771934c76dd63b219069b045dbb5511ee0f45d 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -95,14 +95,35 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm diff --git a/patches/api/0383-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/api/0383-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0383-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/unapplied/api/0383-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/unapplied/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/unapplied/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/unapplied/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0386-Add-getDrops-to-BlockState.patch b/patches/unapplied/api/0386-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0386-Add-getDrops-to-BlockState.patch rename to patches/unapplied/api/0386-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0387-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/api/0387-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0387-Add-PlayerInventorySlotChangeEvent.patch rename to patches/unapplied/api/0387-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0388-Elder-Guardian-appearance-API.patch b/patches/unapplied/api/0388-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0388-Elder-Guardian-appearance-API.patch rename to patches/unapplied/api/0388-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0389-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/api/0389-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0389-Allow-changing-bed-s-occupied-property.patch rename to patches/unapplied/api/0389-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0390-Add-EquipmentSlot-convenience-methods.patch b/patches/unapplied/api/0390-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0390-Add-EquipmentSlot-convenience-methods.patch rename to patches/unapplied/api/0390-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/unapplied/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/unapplied/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0392-Add-entity-knockback-API.patch b/patches/unapplied/api/0392-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0392-Add-entity-knockback-API.patch rename to patches/unapplied/api/0392-Add-entity-knockback-API.patch diff --git a/patches/api/0393-Added-EntityToggleSitEvent.patch b/patches/unapplied/api/0393-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0393-Added-EntityToggleSitEvent.patch rename to patches/unapplied/api/0393-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0394-Add-Moving-Piston-API.patch b/patches/unapplied/api/0394-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0394-Add-Moving-Piston-API.patch rename to patches/unapplied/api/0394-Add-Moving-Piston-API.patch diff --git a/patches/api/0395-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/api/0395-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0395-Add-PrePlayerAttackEntityEvent.patch rename to patches/unapplied/api/0395-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0396-Add-Player-Warden-Warning-API.patch b/patches/unapplied/api/0396-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0396-Add-Player-Warden-Warning-API.patch rename to patches/unapplied/api/0396-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0397-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/api/0397-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0397-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/unapplied/api/0397-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0398-Add-paper-dumplisteners-command.patch b/patches/unapplied/api/0398-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0398-Add-paper-dumplisteners-command.patch rename to patches/unapplied/api/0398-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0399-ItemStack-damage-API.patch b/patches/unapplied/api/0399-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0399-ItemStack-damage-API.patch rename to patches/unapplied/api/0399-ItemStack-damage-API.patch diff --git a/patches/api/0400-Add-Tick-TemporalUnit.patch b/patches/unapplied/api/0400-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0400-Add-Tick-TemporalUnit.patch rename to patches/unapplied/api/0400-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0401-Friction-API.patch b/patches/unapplied/api/0401-Friction-API.patch similarity index 100% rename from patches/api/0401-Friction-API.patch rename to patches/unapplied/api/0401-Friction-API.patch diff --git a/patches/api/0402-Player-Entity-Tracking-Events.patch b/patches/unapplied/api/0402-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0402-Player-Entity-Tracking-Events.patch rename to patches/unapplied/api/0402-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0403-Add-missing-Fluid-type.patch b/patches/unapplied/api/0403-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0403-Add-missing-Fluid-type.patch rename to patches/unapplied/api/0403-Add-missing-Fluid-type.patch diff --git a/patches/api/0404-Mark-experimental-api-as-such.patch b/patches/unapplied/api/0404-Mark-experimental-api-as-such.patch similarity index 100% rename from patches/api/0404-Mark-experimental-api-as-such.patch rename to patches/unapplied/api/0404-Mark-experimental-api-as-such.patch diff --git a/patches/api/0405-fix-Instruments.patch b/patches/unapplied/api/0405-fix-Instruments.patch similarity index 98% rename from patches/api/0405-fix-Instruments.patch rename to patches/unapplied/api/0405-fix-Instruments.patch index ff62e930b4..b4068fdbf3 100644 --- a/patches/api/0405-fix-Instruments.patch +++ b/patches/unapplied/api/0405-fix-Instruments.patch @@ -105,7 +105,7 @@ index de976be7132d05506fde7a839cac3954b0dd8da4..27dafd1850d3b984a6af155f5c08ee54 public static Instrument getByType(final byte type) { return BY_DATA.get(type); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a7adeb2f77bcc4e7d2402d21d3f3189bc09144b7..cdb6ad62da2cdc38807550555753447af3b40fb2 100644 +index 33c2dd4ef74f20d33cc81eccd6a55f02550ce3ea..ac992523f09ffe35a55ef6f67115d3862504c2a6 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -390,9 +390,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0406-Add-BlockLockCheckEvent.patch b/patches/unapplied/api/0406-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0406-Add-BlockLockCheckEvent.patch rename to patches/unapplied/api/0406-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0407-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/api/0407-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/api/0407-Add-Sneaking-API-for-Entities.patch rename to patches/unapplied/api/0407-Add-Sneaking-API-for-Entities.patch diff --git a/patches/api/0408-Improve-PortalEvents.patch b/patches/unapplied/api/0408-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0408-Improve-PortalEvents.patch rename to patches/unapplied/api/0408-Improve-PortalEvents.patch diff --git a/patches/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/unapplied/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/unapplied/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/api/0410-Flying-Fall-Damage-API.patch b/patches/unapplied/api/0410-Flying-Fall-Damage-API.patch similarity index 93% rename from patches/api/0410-Flying-Fall-Damage-API.patch rename to patches/unapplied/api/0410-Flying-Fall-Damage-API.patch index 3feb79f975..9cbe27900b 100644 --- a/patches/api/0410-Flying-Fall-Damage-API.patch +++ b/patches/unapplied/api/0410-Flying-Fall-Damage-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b6284a2e4f66b1f2ec2ac59f36190a44bbce260f..43c9cfef868b2e68e2c5741c095cc214d2095b70 100644 +index 213eb6bf962b4bd6fcab9f8a5fa90962e7805d8c..b8d0548099cd118dcfcfa5391594b46f0740d10e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1423,6 +1423,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/unapplied/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/unapplied/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/unapplied/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0413-Win-Screen-API.patch b/patches/unapplied/api/0413-Win-Screen-API.patch similarity index 96% rename from patches/api/0413-Win-Screen-API.patch rename to patches/unapplied/api/0413-Win-Screen-API.patch index 75167568ff..927695fc94 100644 --- a/patches/api/0413-Win-Screen-API.patch +++ b/patches/unapplied/api/0413-Win-Screen-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 43c9cfef868b2e68e2c5741c095cc214d2095b70..49a797325be9a9e7174610dccba12b0a19cf6723 100644 +index b8d0548099cd118dcfcfa5391594b46f0740d10e..fd890d0a3a2c92ad821ade7711191bdb0e3e3624 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -854,6 +854,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0414-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/api/0414-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/api/0414-Add-Entity-Body-Yaw-API.patch rename to patches/unapplied/api/0414-Add-Entity-Body-Yaw-API.patch diff --git a/patches/api/0415-Add-missing-isFuel-Material-entries.patch b/patches/unapplied/api/0415-Add-missing-isFuel-Material-entries.patch similarity index 100% rename from patches/api/0415-Add-missing-isFuel-Material-entries.patch rename to patches/unapplied/api/0415-Add-missing-isFuel-Material-entries.patch diff --git a/patches/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/unapplied/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/unapplied/api/0416-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0417-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/api/0417-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0417-Add-EntityFertilizeEggEvent.patch rename to patches/unapplied/api/0417-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/unapplied/api/0418-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch similarity index 98% rename from patches/server/0002-Remap-fixes.patch rename to patches/unapplied/server/0002-Remap-fixes.patch index 9fef1ca191..b63ab523d5 100644 --- a/patches/server/0002-Remap-fixes.patch +++ b/patches/unapplied/server/0002-Remap-fixes.patch @@ -119,7 +119,7 @@ index ad52c3fc6210939a39ef77a382c640a24ee44838..6b7dd01778f0a5d3a96d2d04af4b525d } } diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java -index f0333f01dddb2808eeaa796d9284d5cb3ad4934c..b2efb294822c53768bde38e7a78c7b8f093481e9 100644 +index b1de312e902c83a2f95d80040abb9255e64431a9..aafa6f472c82f851fe7f5ae3111488bb732d0bcc 100644 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java +++ b/src/test/java/org/bukkit/entity/EntityTypesTest.java @@ -5,7 +5,6 @@ import java.util.Set; diff --git a/patches/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch similarity index 100% rename from patches/server/0003-Build-system-changes.patch rename to patches/unapplied/server/0003-Build-system-changes.patch diff --git a/patches/server/0004-Test-changes.patch b/patches/unapplied/server/0004-Test-changes.patch similarity index 100% rename from patches/server/0004-Test-changes.patch rename to patches/unapplied/server/0004-Test-changes.patch diff --git a/patches/server/0005-Paper-config-files.patch b/patches/unapplied/server/0005-Paper-config-files.patch similarity index 100% rename from patches/server/0005-Paper-config-files.patch rename to patches/unapplied/server/0005-Paper-config-files.patch diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/unapplied/server/0006-MC-Dev-fixes.patch similarity index 100% rename from patches/server/0006-MC-Dev-fixes.patch rename to patches/unapplied/server/0006-MC-Dev-fixes.patch diff --git a/patches/server/0007-ConcurrentUtil.patch b/patches/unapplied/server/0007-ConcurrentUtil.patch similarity index 100% rename from patches/server/0007-ConcurrentUtil.patch rename to patches/unapplied/server/0007-ConcurrentUtil.patch diff --git a/patches/server/0008-CB-fixes.patch b/patches/unapplied/server/0008-CB-fixes.patch similarity index 100% rename from patches/server/0008-CB-fixes.patch rename to patches/unapplied/server/0008-CB-fixes.patch diff --git a/patches/server/0009-MC-Utils.patch b/patches/unapplied/server/0009-MC-Utils.patch similarity index 99% rename from patches/server/0009-MC-Utils.patch rename to patches/unapplied/server/0009-MC-Utils.patch index aebe143be4..82977be2d9 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/unapplied/server/0009-MC-Utils.patch @@ -6528,7 +6528,7 @@ index 8309eb14140ebcf62ae7be1dfa0177ac7fcf83d7..8784b0702f10eb7582c309c15f18fe13 public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { // Holder holder = worlddimension.type(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f7c5f0cd9d467305c123d3e86c5723055424600e..56016d59d66d90de2ac4326c16b09f86e4ac390b 100644 +index 33fb63cbb0b115d41a1f9c24a1df328a86d5cb7d..39f60f3878b57feeb6c2645a8ed4432fb53a0269 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -247,6 +247,8 @@ public class ServerPlayer extends Player { @@ -7624,7 +7624,7 @@ index 0000000000000000000000000000000000000000..909b2c98e7a9117d2f737245e4661792 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 8ded1f61a6088cf57847a409421e92e2d2007158..b39ded554ee86bf840ce04eba58ac19d40226c9f 100644 +index 7f71bac4667235910ecbd8954514a95e92603594..21ca79fa628d9cc970942bcd5368d971d800753a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -102,8 +102,17 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0010-Adventure.patch b/patches/unapplied/server/0010-Adventure.patch similarity index 100% rename from patches/server/0010-Adventure.patch rename to patches/unapplied/server/0010-Adventure.patch diff --git a/patches/server/0011-Paper-command.patch b/patches/unapplied/server/0011-Paper-command.patch similarity index 100% rename from patches/server/0011-Paper-command.patch rename to patches/unapplied/server/0011-Paper-command.patch diff --git a/patches/server/0012-Paper-Metrics.patch b/patches/unapplied/server/0012-Paper-Metrics.patch similarity index 100% rename from patches/server/0012-Paper-Metrics.patch rename to patches/unapplied/server/0012-Paper-Metrics.patch diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/unapplied/server/0013-Paper-Plugins.patch similarity index 100% rename from patches/server/0013-Paper-Plugins.patch rename to patches/unapplied/server/0013-Paper-Plugins.patch diff --git a/patches/server/0014-Timings-v2.patch b/patches/unapplied/server/0014-Timings-v2.patch similarity index 99% rename from patches/server/0014-Timings-v2.patch rename to patches/unapplied/server/0014-Timings-v2.patch index a1210bcddf..89d3e91172 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/unapplied/server/0014-Timings-v2.patch @@ -1262,7 +1262,7 @@ index 8784b0702f10eb7582c309c15f18fe13eebd9c8e..6f81aa6b0a835bf10e0d5f2b32fe9fb2 this.entityManager.saveAll(); } else { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2f7e63a1206f954aac9ded087eeda3d566443189..c47ae6b97e0bb6a52430c01f0b989bf9f81744a9 100644 +index e5407a092c602cfec4bcc80198d2a9f3f5d3680b..526a8ffa7761a013e4db24e983d716fdf529b755 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -335,7 +335,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0015-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0015-Rewrite-dataconverter-system.patch rename to patches/unapplied/server/0015-Rewrite-dataconverter-system.patch diff --git a/patches/server/0016-Starlight.patch b/patches/unapplied/server/0016-Starlight.patch similarity index 100% rename from patches/server/0016-Starlight.patch rename to patches/unapplied/server/0016-Starlight.patch diff --git a/patches/server/0017-Add-TickThread.patch b/patches/unapplied/server/0017-Add-TickThread.patch similarity index 100% rename from patches/server/0017-Add-TickThread.patch rename to patches/unapplied/server/0017-Add-TickThread.patch diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/unapplied/server/0018-Rewrite-chunk-system.patch similarity index 99% rename from patches/server/0018-Rewrite-chunk-system.patch rename to patches/unapplied/server/0018-Rewrite-chunk-system.patch index bfed2ef66c..e113e0e8ce 100644 --- a/patches/server/0018-Rewrite-chunk-system.patch +++ b/patches/unapplied/server/0018-Rewrite-chunk-system.patch @@ -15922,7 +15922,7 @@ index e96a0ca47e4701ba187555bd92c968345bc85677..73b96f804079288e9c5fcc11da54e61e + // Paper end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fdb7314784a2232a96a9ccdb049bd240e1cc9b06..8ef64f5192500f87f514c42432c0d5c8361145a7 100644 +index 526a8ffa7761a013e4db24e983d716fdf529b755..fe315458cead06c3f01473e84b050dadb5ad2726 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -776,6 +776,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -18004,7 +18004,7 @@ index fd1da8431578832bcd1f3ca7890dd2150b916ebd..958c5faeddd3ee54ac2880eb3eb9e4ab // Spigot start private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b09d8420ffe3c7e2ba173ee98643bc17909db563..9a6c9c42b162315115781246cdf91af816d93293 100644 +index ef1a0db17276178717b83a6d081a9e111d34e4e5..92e5b781049122e3de3784ec4197557f2730b3b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -176,6 +176,81 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 97% rename from patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch index ae8da5a8b5..f39b2a5a40 100644 --- a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -47,7 +47,7 @@ index d6f858ee1245b313024c36ac2a0edd09b9307bca..d82e0dd38ef2b32d82e906d5bc71b460 if (type == PluginLoadOrder.STARTUP) { this.helpMap.clear(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 5448d2a6fe8cace246b81742da19666ec24ca48c..a51581263f1c9d72aab7c9223a816d034630f702 100644 +index 481c1f853bbe81da123cfb3f79ed4509cf127db8..985aae207e23584519b4c096f2aaaf0e80b6c163 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -149,6 +149,12 @@ public class Main { diff --git a/patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch similarity index 100% rename from patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch rename to patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch diff --git a/patches/server/0021-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/0021-Configurable-baby-zombie-movement-speed.patch rename to patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/0022-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch similarity index 100% rename from patches/server/0022-Configurable-fishing-time-ranges.patch rename to patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch diff --git a/patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch similarity index 100% rename from patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch rename to patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch diff --git a/patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 100% rename from patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch rename to patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch diff --git a/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch rename to patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 100% rename from patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch diff --git a/patches/server/0028-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch similarity index 100% rename from patches/server/0028-Implement-Paper-VersionChecker.patch rename to patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch diff --git a/patches/server/0029-Add-version-history-to-version-command.patch b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch similarity index 100% rename from patches/server/0029-Add-version-history-to-version-command.patch rename to patches/unapplied/server/0029-Add-version-history-to-version-command.patch diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/unapplied/server/0030-Player-affects-spawning-API.patch similarity index 100% rename from patches/server/0030-Player-affects-spawning-API.patch rename to patches/unapplied/server/0030-Player-affects-spawning-API.patch diff --git a/patches/server/0031-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0031-Further-improve-server-tick-loop.patch similarity index 100% rename from patches/server/0031-Further-improve-server-tick-loop.patch rename to patches/unapplied/server/0031-Further-improve-server-tick-loop.patch diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/0032-Only-refresh-abilities-if-needed.patch rename to patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/unapplied/server/0033-Entity-Origin-API.patch similarity index 100% rename from patches/server/0033-Entity-Origin-API.patch rename to patches/unapplied/server/0033-Entity-Origin-API.patch diff --git a/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch similarity index 100% rename from patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch rename to patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch diff --git a/patches/server/0035-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch similarity index 100% rename from patches/server/0035-Configurable-top-of-nether-void-damage.patch rename to patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch diff --git a/patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/server/0037-Always-tick-falling-blocks.patch b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch similarity index 100% rename from patches/server/0037-Always-tick-falling-blocks.patch rename to patches/unapplied/server/0037-Always-tick-falling-blocks.patch diff --git a/patches/server/0038-Configurable-end-credits.patch b/patches/unapplied/server/0038-Configurable-end-credits.patch similarity index 91% rename from patches/server/0038-Configurable-end-credits.patch rename to patches/unapplied/server/0038-Configurable-end-credits.patch index 6037ece7eb..173fd26d6e 100644 --- a/patches/server/0038-Configurable-end-credits.patch +++ b/patches/unapplied/server/0038-Configurable-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e06b2a8eece6f179e4a3f38754fd8d9e7b69bdc4..d7b581a34d95b038e548a7380ce00ebba9835606 100644 +index 650d28ce34239d3ae9caa3852e1bac518790fd83..ecb57a664da6be49611b95bf6bde3d9c3f893e82 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1011,6 +1011,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 92% rename from patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch index 91ece8f728..bba5b9b5c4 100644 --- a/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 84b903ec43ce39ef530ecbcc65999df748f785af..735442e98fc9f5a182ff15a526d9601162c9418d 100644 +index 5ab38db6305d885ab61ee2c25ccb5ee77bb31370..c5544f952be057bae9407725d885798f461081ea 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -202,7 +202,7 @@ public class Explosion { diff --git a/patches/server/0040-Optimize-explosions.patch b/patches/unapplied/server/0040-Optimize-explosions.patch similarity index 100% rename from patches/server/0040-Optimize-explosions.patch rename to patches/unapplied/server/0040-Optimize-explosions.patch diff --git a/patches/server/0041-Disable-explosion-knockback.patch b/patches/unapplied/server/0041-Disable-explosion-knockback.patch similarity index 100% rename from patches/server/0041-Disable-explosion-knockback.patch rename to patches/unapplied/server/0041-Disable-explosion-knockback.patch diff --git a/patches/server/0042-Disable-thunder.patch b/patches/unapplied/server/0042-Disable-thunder.patch similarity index 100% rename from patches/server/0042-Disable-thunder.patch rename to patches/unapplied/server/0042-Disable-thunder.patch diff --git a/patches/server/0043-Disable-ice-and-snow.patch b/patches/unapplied/server/0043-Disable-ice-and-snow.patch similarity index 100% rename from patches/server/0043-Disable-ice-and-snow.patch rename to patches/unapplied/server/0043-Disable-ice-and-snow.patch diff --git a/patches/server/0044-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/server/0044-Configurable-mob-spawner-tick-rate.patch rename to patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch similarity index 96% rename from patches/server/0045-Implement-PlayerLocaleChangeEvent.patch rename to patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch index b03de0c378..8e3f247d4a 100644 --- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch +++ b/patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d7b581a34d95b038e548a7380ce00ebba9835606..a95e2e05db626edbedaa604f059e19a592a682a3 100644 +index ecb57a664da6be49611b95bf6bde3d9c3f893e82..c0651c446bdcc4d96df36ad201b77f5ffffa5a7d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1787,7 +1787,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0046-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0046-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/server/0046-Add-BeaconEffectEvent.patch rename to patches/unapplied/server/0046-Add-BeaconEffectEvent.patch diff --git a/patches/server/0047-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch similarity index 93% rename from patches/server/0047-Configurable-container-update-tick-rate.patch rename to patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch index 72bb76e5ac..355420783e 100644 --- a/patches/server/0047-Configurable-container-update-tick-rate.patch +++ b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a95e2e05db626edbedaa604f059e19a592a682a3..c9e262967f040d224e284aa82256422db14aa9d5 100644 +index c0651c446bdcc4d96df36ad201b77f5ffffa5a7d..cba9b5586048500d91081cc8ef2ad7ae2bb7a816 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -233,6 +233,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0048-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/server/0048-Use-UserCache-for-player-heads.patch rename to patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch diff --git a/patches/server/0049-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/server/0049-Disable-spigot-tick-limiters.patch rename to patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch diff --git a/patches/server/0050-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/server/0050-Add-PlayerInitialSpawnEvent.patch rename to patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/server/0052-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0052-Ensure-commands-are-not-ran-async.patch similarity index 97% rename from patches/server/0052-Ensure-commands-are-not-ran-async.patch rename to patches/unapplied/server/0052-Ensure-commands-are-not-ran-async.patch index 9fe66d2933..91ef061119 100644 --- a/patches/server/0052-Ensure-commands-are-not-ran-async.patch +++ b/patches/unapplied/server/0052-Ensure-commands-are-not-ran-async.patch @@ -21,7 +21,7 @@ character. Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8ef64f5192500f87f514c42432c0d5c8361145a7..f9f18e263d29421bdc83993a6fd55f47cb7ab926 100644 +index fe315458cead06c3f01473e84b050dadb5ad2726..301d90618f51b90a4a7b0158deef7373fba9cca8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2040,7 +2040,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -107,7 +107,7 @@ index babde3ac7af9b5659bcc7e0298d1d77e7b2d60e2..369657f5c54dae7b03b09aec1c672dc3 return true; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 63e01d1380135072735444724a9b060be364cec4..b3fc0f67715707bf4ad6ff88fbf8dab1c830d74b 100644 +index 31172053e26a8df53d0987e816b3e03a560332e6..59e0a9b6f07342120ee5ca00434905b26faf04ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -504,7 +504,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/0054-Expose-server-CommandMap.patch b/patches/unapplied/server/0054-Expose-server-CommandMap.patch similarity index 100% rename from patches/server/0054-Expose-server-CommandMap.patch rename to patches/unapplied/server/0054-Expose-server-CommandMap.patch diff --git a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch similarity index 98% rename from patches/server/0056-Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch index da0ca18eab..a964f4dfaf 100644 --- a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch +++ b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch @@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4 // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b3fc0f67715707bf4ad6ff88fbf8dab1c830d74b..8db291b3dceaa49f095cf7486e4b7f69209548b4 100644 +index 59e0a9b6f07342120ee5ca00434905b26faf04ca..0a92f895922f5eacb87fc6cf4cd9e3783703cdf9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0057-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/0057-Add-configurable-portal-search-radius.patch rename to patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/unapplied/server/0058-Add-velocity-warnings.patch similarity index 100% rename from patches/server/0058-Add-velocity-warnings.patch rename to patches/unapplied/server/0058-Add-velocity-warnings.patch diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch similarity index 100% rename from patches/server/0059-Configurable-inter-world-teleportation-safety.patch rename to patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch diff --git a/patches/server/0060-Add-exception-reporting-event.patch b/patches/unapplied/server/0060-Add-exception-reporting-event.patch similarity index 100% rename from patches/server/0060-Add-exception-reporting-event.patch rename to patches/unapplied/server/0060-Add-exception-reporting-event.patch diff --git a/patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 100% rename from patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch diff --git a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch similarity index 100% rename from patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch diff --git a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0064-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/0064-Chunk-Save-Reattempt.patch rename to patches/unapplied/server/0064-Chunk-Save-Reattempt.patch diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/unapplied/server/0065-Complete-resource-pack-API.patch similarity index 97% rename from patches/server/0065-Complete-resource-pack-API.patch rename to patches/unapplied/server/0065-Complete-resource-pack-API.patch index 28d589c62f..1ed931325f 100644 --- a/patches/server/0065-Complete-resource-pack-API.patch +++ b/patches/unapplied/server/0065-Complete-resource-pack-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 706e777cad3e5d56896b05740d42216aa2660f0b..38aad9faade27d1362711915cd4ccabedd8521e2 100644 +index 301d90618f51b90a4a7b0158deef7373fba9cca8..eaf0e468d7ebf54290ae9e2df9f4a2c252142f65 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1764,8 +1764,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/0066-Default-loading-permissions.yml-before-plugins.patch rename to patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch rename to patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0068-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0068-Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/0068-Remove-Metadata-on-reload.patch rename to patches/unapplied/server/0068-Remove-Metadata-on-reload.patch diff --git a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/0069-Handle-Item-Meta-Inconsistencies.patch rename to patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0071-Add-World-Util-Methods.patch b/patches/unapplied/server/0071-Add-World-Util-Methods.patch similarity index 100% rename from patches/server/0071-Add-World-Util-Methods.patch rename to patches/unapplied/server/0071-Add-World-Util-Methods.patch diff --git a/patches/server/0072-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0072-Custom-replacement-for-eaten-items.patch rename to patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/unapplied/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0074-Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/0074-Use-a-Shared-Random-for-Entities.patch rename to patches/unapplied/server/0074-Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/unapplied/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/unapplied/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 100% rename from patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/unapplied/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0079-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/0079-Configurable-Chunk-Inhabited-Time.patch rename to patches/unapplied/server/0079-Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/unapplied/server/0080-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0080-EntityPathfindEvent.patch rename to patches/unapplied/server/0080-EntityPathfindEvent.patch diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/unapplied/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0082-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch rename to patches/unapplied/server/0082-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0083-Add-PlayerUseUnknownEntityEvent.patch similarity index 97% rename from patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/server/0083-Add-PlayerUseUnknownEntityEvent.patch index 251501fad1..0123731b3d 100644 --- a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/unapplied/server/0083-Add-PlayerUseUnknownEntityEvent.patch @@ -22,7 +22,7 @@ index a5d57cc862036012d83b090bb1b3ccf4115a88b3..21068f766b75c414d5818073b7dca083 static final ServerboundInteractPacket.Action ATTACK_ACTION = new ServerboundInteractPacket.Action() { @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f49a8a0f56bc3dd9e8a33cfefefed414e56153fd..8bed76ec7692a75f12e724a36f3dd9050760b7ea 100644 +index eaf0e468d7ebf54290ae9e2df9f4a2c252142f65..050e8f545f5cc86985d3dbbe3192f632b64af66f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2525,8 +2525,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0084-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/unapplied/server/0084-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/unapplied/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0086-Optimize-DataBits.patch b/patches/unapplied/server/0086-Optimize-DataBits.patch similarity index 100% rename from patches/server/0086-Optimize-DataBits.patch rename to patches/unapplied/server/0086-Optimize-DataBits.patch diff --git a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/unapplied/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/unapplied/server/0088-Configurable-Player-Collision.patch similarity index 100% rename from patches/server/0088-Configurable-Player-Collision.patch rename to patches/unapplied/server/0088-Configurable-Player-Collision.patch diff --git a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/unapplied/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0090-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0090-Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/0090-Configurable-RCON-IP-address.patch rename to patches/unapplied/server/0090-Configurable-RCON-IP-address.patch diff --git a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0092-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch rename to patches/unapplied/server/0092-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0093-remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/0093-remove-null-possibility-for-getServer-singleton.patch rename to patches/unapplied/server/0093-remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/unapplied/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 100% rename from patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch rename to patches/unapplied/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch diff --git a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/unapplied/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/0097-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0097-System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/0097-System-property-for-disabling-watchdoge.patch rename to patches/unapplied/server/0097-System-property-for-disabling-watchdoge.patch diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0098-Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/0098-Async-GameProfileCache-saving.patch rename to patches/unapplied/server/0098-Async-GameProfileCache-saving.patch diff --git a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0099-Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch rename to patches/unapplied/server/0099-Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0100-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/unapplied/server/0100-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/0101-Add-server-name-parameter.patch b/patches/unapplied/server/0101-Add-server-name-parameter.patch similarity index 90% rename from patches/server/0101-Add-server-name-parameter.patch rename to patches/unapplied/server/0101-Add-server-name-parameter.patch index 8f015867da..14a157c89c 100644 --- a/patches/server/0101-Add-server-name-parameter.patch +++ b/patches/unapplied/server/0101-Add-server-name-parameter.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d453c630da1780a7aeab80cf95adcee62f4e8a14..47c97c16eb23cdd485858c39c571a7ef5ac6d594 100644 +index 49f6d20706e8fb94c41834f5addcd015d18acd7e..ef46dc1ed538b783213651f624326b2d49c786e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -156,6 +156,14 @@ public class Main { diff --git a/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/unapplied/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch similarity index 100% rename from patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch rename to patches/unapplied/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch diff --git a/patches/server/0103-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0103-Fix-Old-Sign-Conversion.patch similarity index 100% rename from patches/server/0103-Fix-Old-Sign-Conversion.patch rename to patches/unapplied/server/0103-Fix-Old-Sign-Conversion.patch diff --git a/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/server/0106-Add-setting-for-proxy-online-mode-status.patch rename to patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch rename to patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/0108-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch similarity index 94% rename from patches/server/0108-Configurable-packet-in-spam-threshold.patch rename to patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch index 657327e01d..252915bd57 100644 --- a/patches/server/0108-Configurable-packet-in-spam-threshold.patch +++ b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8bed76ec7692a75f12e724a36f3dd9050760b7ea..481ddcf40d1e96d162b0e28737a71fb390e8715d 100644 +index 050e8f545f5cc86985d3dbbe3192f632b64af66f..f0303267251e9f9b30897159b239db85d1170591 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1604,13 +1604,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0109-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch similarity index 95% rename from patches/server/0109-Configurable-flying-kick-messages.patch rename to patches/unapplied/server/0109-Configurable-flying-kick-messages.patch index a57e0ec899..cd55262734 100644 --- a/patches/server/0109-Configurable-flying-kick-messages.patch +++ b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 481ddcf40d1e96d162b0e28737a71fb390e8715d..f1e91f245a291d403f7668470dbda015b9a731cd 100644 +index f0303267251e9f9b30897159b239db85d1170591..534ae13641f36f94abb3a62538b072c7afc587fe 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -351,7 +351,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/unapplied/server/0110-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0110-Add-EntityZapEvent.patch rename to patches/unapplied/server/0110-Add-EntityZapEvent.patch diff --git a/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch similarity index 100% rename from patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch rename to patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch diff --git a/patches/server/0112-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0112-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0112-Cache-user-authenticator-threads.patch rename to patches/unapplied/server/0112-Cache-user-authenticator-threads.patch diff --git a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0113-Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/0115-Add-ProjectileCollideEvent.patch rename to patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch diff --git a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch rename to patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch rename to patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0120-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch similarity index 100% rename from patches/server/0120-Optimize-ItemStack.isEmpty.patch rename to patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch diff --git a/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/0122-String-based-Action-Bar-API.patch b/patches/unapplied/server/0122-String-based-Action-Bar-API.patch similarity index 96% rename from patches/server/0122-String-based-Action-Bar-API.patch rename to patches/unapplied/server/0122-String-based-Action-Bar-API.patch index c3b6732b99..11977035cf 100644 --- a/patches/server/0122-String-based-Action-Bar-API.patch +++ b/patches/unapplied/server/0122-String-based-Action-Bar-API.patch @@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2338f20c1af3b93cb6dd1a3c518499e6dd2130c3..3f1ed61a120f7adebfba2741a8c671a1e464471b 100644 +index b08b72f8c029faae9b9d425e8ce77a1ff23addd7..aa81018c455629659df34802002105966bd89de3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -357,6 +357,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0123-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch similarity index 88% rename from patches/server/0123-Properly-fix-item-duplication-bug.patch rename to patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch index 71a4812e1e..c143764110 100644 --- a/patches/server/0123-Properly-fix-item-duplication-bug.patch +++ b/patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c9e262967f040d224e284aa82256422db14aa9d5..dc0c89e39f291e735fc1dbf3ccf262a5b4f22459 100644 +index cba9b5586048500d91081cc8ef2ad7ae2bb7a816..04912bd14a2b03ca123561a3e21a812b8f806366 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2243,7 +2243,7 @@ public class ServerPlayer extends Player { @@ -19,7 +19,7 @@ index c9e262967f040d224e284aa82256422db14aa9d5..dc0c89e39f291e735fc1dbf3ccf262a5 @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f1e91f245a291d403f7668470dbda015b9a731cd..15470487e8ea0dd36aa961e6f6ad124b3ba6dcc0 100644 +index 534ae13641f36f94abb3a62538b072c7afc587fe..d0cef1be518aa788a6a2ce7788887afb66259b66 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3169,7 +3169,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0124-Firework-API-s.patch b/patches/unapplied/server/0124-Firework-API-s.patch similarity index 100% rename from patches/server/0124-Firework-API-s.patch rename to patches/unapplied/server/0124-Firework-API-s.patch diff --git a/patches/server/0125-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0125-PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/0127-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0127-Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/server/0130-Cap-Entity-Collisions.patch b/patches/unapplied/server/0130-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0130-Cap-Entity-Collisions.patch rename to patches/unapplied/server/0130-Cap-Entity-Collisions.patch diff --git a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0132-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0132-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0132-Do-not-let-armorstands-drown.patch rename to patches/unapplied/server/0132-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0133-Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/unapplied/server/0133-Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 96% rename from patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/unapplied/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index de73ca1fc0..9be877b3b5 100644 --- a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/patches/unapplied/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future? public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 15470487e8ea0dd36aa961e6f6ad124b3ba6dcc0..c2d6fa75164dd98ff012611d4da354a6b48cf058 100644 +index d0cef1be518aa788a6a2ce7788887afb66259b66..3757be5d859ca388569b391df0b9bddd87181265 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2327,6 +2327,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/unapplied/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 100% rename from patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/unapplied/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch diff --git a/patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/unapplied/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0138-Item-canEntityPickup.patch b/patches/unapplied/server/0138-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0138-Item-canEntityPickup.patch rename to patches/unapplied/server/0138-Item-canEntityPickup.patch diff --git a/patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0140-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0140-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0140-PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/server/0140-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/unapplied/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0142-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0142-Add-UnknownCommandEvent.patch rename to patches/unapplied/server/0142-Add-UnknownCommandEvent.patch diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0143-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0143-Basic-PlayerProfile-API.patch rename to patches/unapplied/server/0143-Basic-PlayerProfile-API.patch diff --git a/patches/server/0144-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0144-Shoulder-Entities-Release-API.patch rename to patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0145-Profile-Lookup-Events.patch b/patches/unapplied/server/0145-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0145-Profile-Lookup-Events.patch rename to patches/unapplied/server/0145-Profile-Lookup-Events.patch diff --git a/patches/server/0146-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0146-Block-player-logins-during-server-shutdown.patch rename to patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0147-Entity-fromMobSpawner.patch b/patches/unapplied/server/0147-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0147-Entity-fromMobSpawner.patch rename to patches/unapplied/server/0147-Entity-fromMobSpawner.patch diff --git a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0148-Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0149-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0149-Implement-ensureServerConversions-API.patch rename to patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0150-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0150-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0150-Implement-getI18NDisplayName.patch rename to patches/unapplied/server/0150-Implement-getI18NDisplayName.patch diff --git a/patches/server/0151-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0151-ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0152-Fix-this-stupid-bullshit.patch rename to patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0153-LivingEntity-setKiller.patch b/patches/unapplied/server/0153-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0153-LivingEntity-setKiller.patch rename to patches/unapplied/server/0153-LivingEntity-setKiller.patch diff --git a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0159-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0159-Add-PlayerJumpEvent.patch similarity index 96% rename from patches/server/0159-Add-PlayerJumpEvent.patch rename to patches/unapplied/server/0159-Add-PlayerJumpEvent.patch index a2c0798ac2..1d8f26df9a 100644 --- a/patches/server/0159-Add-PlayerJumpEvent.patch +++ b/patches/unapplied/server/0159-Add-PlayerJumpEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c2d6fa75164dd98ff012611d4da354a6b48cf058..4d768673a70a1b7008572a9bc331e4d7de6990d8 100644 +index 3757be5d859ca388569b391df0b9bddd87181265..95da0857b94d48830d4528b72370a18c244cae04 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1285,7 +1285,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0160-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0160-handle-ServerboundKeepAlivePacket-async.patch similarity index 95% rename from patches/server/0160-handle-ServerboundKeepAlivePacket-async.patch rename to patches/unapplied/server/0160-handle-ServerboundKeepAlivePacket-async.patch index 3513a766e1..b282d59bc8 100644 --- a/patches/server/0160-handle-ServerboundKeepAlivePacket-async.patch +++ b/patches/unapplied/server/0160-handle-ServerboundKeepAlivePacket-async.patch @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4d768673a70a1b7008572a9bc331e4d7de6990d8..12e3f10ff7134191c50faa0b84578546399d1b56 100644 +index 95da0857b94d48830d4528b72370a18c244cae04..9d764b32b669c8970ac472faa3000f7a95d20342 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3128,14 +3128,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch similarity index 97% rename from patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch rename to patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch index cb5c14c4b7..f5e11dd5f1 100644 --- a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch @@ -90,7 +90,7 @@ index 8284d49c8e30645d00be952c847bab7ce5753d78..a738b79e775a0a4abed1a05e12495d85 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3f1ed61a120f7adebfba2741a8c671a1e464471b..dfabf22bb14bbbd6b2d2b9beafa3815303f32f7f 100644 +index aa81018c455629659df34802002105966bd89de3..dfc5a445744520388bd09cf4a68a232885c6e2c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -301,6 +301,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch similarity index 97% rename from patches/server/0162-revert-serverside-behavior-of-keepalives.patch rename to patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch index 01e66ffdcb..04c5c545ba 100644 --- a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch +++ b/patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 12e3f10ff7134191c50faa0b84578546399d1b56..66436cd5b6b14914919a1eb612ca133ee4ffef05 100644 +index 9d764b32b669c8970ac472faa3000f7a95d20342..4c978604cdbc1f6a1590dc13951a0f0963901fae 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -255,7 +255,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0164-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0164-Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0169-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0169-AsyncTabCompleteEvent.patch similarity index 99% rename from patches/server/0169-AsyncTabCompleteEvent.patch rename to patches/unapplied/server/0169-AsyncTabCompleteEvent.patch index b467a3a2e4..899392b5df 100644 --- a/patches/server/0169-AsyncTabCompleteEvent.patch +++ b/patches/unapplied/server/0169-AsyncTabCompleteEvent.patch @@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent Co-authored-by: Aikar diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 66436cd5b6b14914919a1eb612ca133ee4ffef05..43748cb2ee5840ee82d5ab6337a72c863fe06d3d 100644 +index 4c978604cdbc1f6a1590dc13951a0f0963901fae..e6c44e29e6b5bbb49c486685077cb5b1bff24f84 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -776,12 +776,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0170-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0170-PlayerPickupExperienceEvent.patch rename to patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0171-Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0172-PlayerNaturallySpawnCreaturesEvent.patch similarity index 98% rename from patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/server/0172-PlayerNaturallySpawnCreaturesEvent.patch index a9085cc493..2c1f04adb1 100644 --- a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/unapplied/server/0172-PlayerNaturallySpawnCreaturesEvent.patch @@ -60,7 +60,7 @@ index 80d108ae7faf3fdcb024931e93032215935fe70b..c021733342c09adb04ce3f675209543f while (iterator1.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dc0c89e39f291e735fc1dbf3ccf262a5b4f22459..673252f54103a7ab34650db85d6200953755c745 100644 +index 04912bd14a2b03ca123561a3e21a812b8f806366..ac6acdd08e808dfadf2de1075fea0d0ee51dad3b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0173-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/server/0173-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0174-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0174-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0174-PreCreatureSpawnEvent.patch rename to patches/unapplied/server/0174-PreCreatureSpawnEvent.patch diff --git a/patches/server/0175-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0175-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0175-Fill-Profile-Property-Events.patch rename to patches/unapplied/server/0175-Fill-Profile-Property-Events.patch diff --git a/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0176-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/server/0176-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0177-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0177-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0177-Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/server/0177-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0178-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0178-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0178-Extend-Player-Interact-cancellation.patch rename to patches/unapplied/server/0178-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0179-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0179-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0179-Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/server/0179-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/unapplied/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0181-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/unapplied/server/0181-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0182-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0182-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0182-Implement-extended-PaperServerListPingEvent.patch rename to patches/unapplied/server/0182-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/unapplied/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0184-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0184-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0184-Player.setPlayerProfile-API.patch rename to patches/unapplied/server/0184-Player.setPlayerProfile-API.patch diff --git a/patches/server/0185-getPlayerUniqueId-API.patch b/patches/unapplied/server/0185-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0185-getPlayerUniqueId-API.patch rename to patches/unapplied/server/0185-getPlayerUniqueId-API.patch diff --git a/patches/server/0186-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0186-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0186-Improved-Async-Task-Scheduler.patch rename to patches/unapplied/server/0186-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0187-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0187-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0187-Make-legacy-ping-handler-more-reliable.patch rename to patches/unapplied/server/0187-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/unapplied/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0189-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0189-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0189-Flag-to-disable-the-channel-limit.patch rename to patches/unapplied/server/0189-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0190-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0190-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0190-Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/server/0190-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0191-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0191-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0191-Configurable-sprint-interruption-on-attack.patch rename to patches/unapplied/server/0191-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 94% rename from patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 91158da2e6..ac4fcb39e0 100644 --- a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 43748cb2ee5840ee82d5ab6337a72c863fe06d3d..b11f6e5c55e4eeeac82b1567a27b013867a570e3 100644 +index e6c44e29e6b5bbb49c486685077cb5b1bff24f84..e29fffb8f91b52f0da77303c61c0e4fbef13370c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3142,9 +3142,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0193-EndermanEscapeEvent.patch b/patches/unapplied/server/0193-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0193-EndermanEscapeEvent.patch rename to patches/unapplied/server/0193-EndermanEscapeEvent.patch diff --git a/patches/server/0194-Enderman.teleportRandomly.patch b/patches/unapplied/server/0194-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0194-Enderman.teleportRandomly.patch rename to patches/unapplied/server/0194-Enderman.teleportRandomly.patch diff --git a/patches/server/0195-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0195-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0195-Block-Enderpearl-Travel-Exploit.patch rename to patches/unapplied/server/0195-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/unapplied/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0198-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0198-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0198-EndermanAttackPlayerEvent.patch rename to patches/unapplied/server/0198-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0199-WitchConsumePotionEvent.patch b/patches/unapplied/server/0199-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0199-WitchConsumePotionEvent.patch rename to patches/unapplied/server/0199-WitchConsumePotionEvent.patch diff --git a/patches/server/0200-WitchThrowPotionEvent.patch b/patches/unapplied/server/0200-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0200-WitchThrowPotionEvent.patch rename to patches/unapplied/server/0200-WitchThrowPotionEvent.patch diff --git a/patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/unapplied/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0202-WitchReadyPotionEvent.patch b/patches/unapplied/server/0202-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0202-WitchReadyPotionEvent.patch rename to patches/unapplied/server/0202-WitchReadyPotionEvent.patch diff --git a/patches/server/0203-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0203-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0203-ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/server/0203-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0204-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0204-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/unapplied/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0206-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0206-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0206-Fix-CraftEntity-hashCode.patch rename to patches/unapplied/server/0206-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/unapplied/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0208-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/unapplied/server/0208-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0209-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0209-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0209-Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/server/0209-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0210-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0210-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0210-Improve-EntityShootBowEvent.patch rename to patches/unapplied/server/0210-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0211-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0211-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0211-PlayerReadyArrowEvent.patch rename to patches/unapplied/server/0211-PlayerReadyArrowEvent.patch diff --git a/patches/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/unapplied/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch similarity index 100% rename from patches/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch rename to patches/unapplied/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch diff --git a/patches/server/0213-Expand-Explosions-API.patch b/patches/unapplied/server/0213-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0213-Expand-Explosions-API.patch rename to patches/unapplied/server/0213-Expand-Explosions-API.patch diff --git a/patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/unapplied/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0215-RangedEntity-API.patch b/patches/unapplied/server/0215-RangedEntity-API.patch similarity index 100% rename from patches/server/0215-RangedEntity-API.patch rename to patches/unapplied/server/0215-RangedEntity-API.patch diff --git a/patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/unapplied/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0217-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0217-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0217-Implement-World.getEntity-UUID-API.patch rename to patches/unapplied/server/0217-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0218-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0218-InventoryCloseEvent-Reason-API.patch similarity index 97% rename from patches/server/0218-InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/server/0218-InventoryCloseEvent-Reason-API.patch index 0070bf4011..de8d9a62d1 100644 --- a/patches/server/0218-InventoryCloseEvent-Reason-API.patch +++ b/patches/unapplied/server/0218-InventoryCloseEvent-Reason-API.patch @@ -29,7 +29,7 @@ index d17808f6c565712dac31b0db7a4b6baed2dbdf21..8b28de5755ad4fe50903837700feed32 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 673252f54103a7ab34650db85d6200953755c745..ab71db25415e87e2ebd299e4d491be5e08820c21 100644 +index ac6acdd08e808dfadf2de1075fea0d0ee51dad3b..20c4ba5d00f5a40f5c7da282c9c069b365273041 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -633,7 +633,7 @@ public class ServerPlayer extends Player { @@ -75,7 +75,7 @@ index 673252f54103a7ab34650db85d6200953755c745..ab71db25415e87e2ebd299e4d491be5e this.doCloseContainer(); } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 180e9073db54c15585d204c39cb3ba93fd108ab8..2b98424cdb8a5cacd51ba3902360b80aac712e4d 100644 +index e29fffb8f91b52f0da77303c61c0e4fbef13370c..b6ce00b758ca935e991cd4063d85640bc51a356a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -217,6 +217,7 @@ import org.bukkit.event.inventory.ClickType; @@ -173,7 +173,7 @@ index 787ccb37a39bb506cf9fd8d54cf772b346981f85..f5b3190ffb9e9f92977afc9e40ddfa15 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 18b57fef0a5b48a8f88e8e05282171f3666a6d72..df53b772db2394c8927eac39ad62c51a06704965 100644 +index 1d217d3795abe2e0e0d40746a523f78c84127ea4..d9a5a6719be998b9e40ab76519e4f207ee5c6bf9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1184,7 +1184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0219-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0219-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0219-Vex-get-setSummoner-API.patch rename to patches/unapplied/server/0219-Vex-get-setSummoner-API.patch diff --git a/patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 94% rename from patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/unapplied/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 94b94b8fe3..17e9a3a176 100644 --- a/patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/unapplied/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0a4c9fa74b294e9aa15658b7e6a36603f3c55516..dd08e74a2741c89e00fe1487f90834dfbbd92ce2 100644 +index b6ce00b758ca935e991cd4063d85640bc51a356a..0e4db13373a3e2eda7557b872b7e2eb9e8f2ee4f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2545,6 +2545,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 94% rename from patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/unapplied/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index ddd89a5fa4..221daf4dcf 100644 --- a/patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/unapplied/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index ecce63a519c9603c2cff47c4affbd481ccdd07e7..5768077db6c85f05bbab99b08ab39efff99e2692 100644 +index c909ad3e263cdce6766dcc2ac64412effaa9a784..d2b45b70f4951e44b34a67e29d008748ba84a6bf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,6 +27,7 @@ dependencies { diff --git a/patches/server/0222-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0222-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0222-add-more-information-to-Entity.toString.patch rename to patches/unapplied/server/0222-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0223-EnderDragon-Events.patch b/patches/unapplied/server/0223-EnderDragon-Events.patch similarity index 100% rename from patches/server/0223-EnderDragon-Events.patch rename to patches/unapplied/server/0223-EnderDragon-Events.patch diff --git a/patches/server/0224-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0224-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0224-PlayerElytraBoostEvent.patch rename to patches/unapplied/server/0224-PlayerElytraBoostEvent.patch diff --git a/patches/server/0225-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0225-PlayerLaunchProjectileEvent.patch rename to patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0226-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0226-Improve-BlockPosition-inlining.patch rename to patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0228-Vanished-players-don-t-have-rights.patch rename to patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0229-Allow-disabling-armour-stand-ticking.patch rename to patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0230-SkeletonHorse-Additions.patch b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0230-SkeletonHorse-Additions.patch rename to patches/unapplied/server/0230-SkeletonHorse-Additions.patch diff --git a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0232-Implement-Expanded-ArmorStand-API.patch rename to patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0233-AnvilDamageEvent.patch b/patches/unapplied/server/0233-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0233-AnvilDamageEvent.patch rename to patches/unapplied/server/0233-AnvilDamageEvent.patch diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0234-Add-TNTPrimeEvent.patch rename to patches/unapplied/server/0234-Add-TNTPrimeEvent.patch diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 97% rename from patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch index 8f182e4bc9..c8460eb2c5 100644 --- a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index dd08e74a2741c89e00fe1487f90834dfbbd92ce2..34c635da9ff7aee5105f9a6d7661eb13df0b98a3 100644 +index 0e4db13373a3e2eda7557b872b7e2eb9e8f2ee4f..23b56013e449ce4d6bd62096a20135adb87731eb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -261,6 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0236-Fix-NBT-type-issues.patch b/patches/unapplied/server/0236-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0236-Fix-NBT-type-issues.patch rename to patches/unapplied/server/0236-Fix-NBT-type-issues.patch diff --git a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0237-Remove-unnecessary-itemmeta-handling.patch rename to patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch rename to patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0243-Optimize-BlockPosition-helper-methods.patch rename to patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0245-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0245-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0245-Slime-Pathfinder-Events.patch rename to patches/unapplied/server/0245-Slime-Pathfinder-Events.patch diff --git a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0247-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0247-Optimize-CraftBlockData-Creation.patch rename to patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0248-Optimize-MappedRegistry.patch b/patches/unapplied/server/0248-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0248-Optimize-MappedRegistry.patch rename to patches/unapplied/server/0248-Optimize-MappedRegistry.patch diff --git a/patches/server/0249-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0249-Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0250-Add-More-Creeper-API.patch b/patches/unapplied/server/0250-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0250-Add-More-Creeper-API.patch rename to patches/unapplied/server/0250-Add-More-Creeper-API.patch diff --git a/patches/server/0251-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0251-Inventory-removeItemAnySlot.patch rename to patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0255-Improve-death-events.patch b/patches/unapplied/server/0255-Improve-death-events.patch similarity index 100% rename from patches/server/0255-Improve-death-events.patch rename to patches/unapplied/server/0255-Improve-death-events.patch diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0257-Mob-Pathfinding-API.patch b/patches/unapplied/server/0257-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0257-Mob-Pathfinding-API.patch rename to patches/unapplied/server/0257-Mob-Pathfinding-API.patch diff --git a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0264-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0264-Honor-EntityAgeable.ageLock.patch rename to patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0265-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0265-Configurable-connection-throttle-kick-message.patch rename to patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0266-Hook-into-CB-plugin-rewrites.patch rename to patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0267-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0267-PreSpawnerSpawnEvent.patch rename to patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch similarity index 98% rename from patches/server/0268-Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch index da100c4d13..4c3e61ad03 100644 --- a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch +++ b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 24a07ef9f5cbed34d1aefccda9fe655b7dfef7ec..3cb7bca86c6b0696db7ad156d09e29e9da8cc7e7 100644 +index 24a07ef9f5cbed34d1aefccda9fe655b7dfef7ec..bd430a0bc14d5b1b991a0061e50223dd4ad208c2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -117,6 +117,7 @@ import net.minecraft.world.level.storage.loot.LootTable; diff --git a/patches/server/0269-Add-sun-related-API.patch b/patches/unapplied/server/0269-Add-sun-related-API.patch similarity index 100% rename from patches/server/0269-Add-sun-related-API.patch rename to patches/unapplied/server/0269-Add-sun-related-API.patch diff --git a/patches/server/0270-Turtle-API.patch b/patches/unapplied/server/0270-Turtle-API.patch similarity index 100% rename from patches/server/0270-Turtle-API.patch rename to patches/unapplied/server/0270-Turtle-API.patch diff --git a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch similarity index 97% rename from patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch index a56ac11bfd..dad3b18b8f 100644 --- a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch +++ b/patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,7 +19,7 @@ spectate the target entity. Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 117d4d39bd8ad01207f7056f1d82681568de5b38..202be4c0a143a14f99890426c8525484a7e0d6fd 100644 +index 4c8b1d30b82fd7a87f79983577695c680013d3f4..fe6a36015533d31600798a8ef882356caa147274 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1908,15 +1908,59 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0273-Add-more-Witch-API.patch b/patches/unapplied/server/0273-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0273-Add-more-Witch-API.patch rename to patches/unapplied/server/0273-Add-more-Witch-API.patch diff --git a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 98% rename from patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch index 45f1c1f4a3..dd7ba785c8 100644 --- a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 34c635da9ff7aee5105f9a6d7661eb13df0b98a3..a0c18ab3411272229d9c3ce2a8faf4812f8cf60f 100644 +index 23b56013e449ce4d6bd62096a20135adb87731eb..dc6a93405c4371d90ab7f5eaf11b6e105f791ad3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -563,9 +563,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch similarity index 89% rename from patches/server/0276-Reset-players-airTicks-on-respawn.patch rename to patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch index 21f3bd2920..009d7b5cf9 100644 --- a/patches/server/0276-Reset-players-airTicks-on-respawn.patch +++ b/patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 202be4c0a143a14f99890426c8525484a7e0d6fd..3f9f7faeaa33a4f5d55812d6964496c0b9c8abb4 100644 +index fe6a36015533d31600798a8ef882356caa147274..f2d9a475c9e7eb5a9bccdc74f1e361c440285749 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2337,6 +2337,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0279-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0279-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0279-Optimize-World-Time-Updates.patch rename to patches/unapplied/server/0279-Optimize-World-Time-Updates.patch diff --git a/patches/server/0280-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0280-Restore-custom-InventoryHolder-support.patch rename to patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0281-Use-Vanilla-Minecart-Speeds.patch rename to patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0282-Fix-SpongeAbsortEvent-handling.patch rename to patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 98% rename from patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch index 381385f806..31aee1a67c 100644 --- a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch @@ -59,7 +59,7 @@ index 01a321a0c76c55b32922c94297139e85b3d4ac23..514c045883060e4a22f748176091d3b2 this.level.destroyBlockProgress(this.player.getId(), pos, -1); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a0c18ab3411272229d9c3ce2a8faf4812f8cf60f..65da9e37ac3f8bfb1ed36bd3511687c3efac3d91 100644 +index dc6a93405c4371d90ab7f5eaf11b6e105f791ad3..e143fb922a0351f3fbf5c0c208916930a772c006 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1668,6 +1668,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0284-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0284-Make-the-default-permission-message-configurable.patch rename to patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch rename to patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0286-Handle-Large-Packets-disconnecting-client.patch rename to patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0287-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch similarity index 97% rename from patches/server/0287-force-entity-dismount-during-teleportation.patch rename to patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch index 11fb53a144..c8fc4e85e0 100644 --- a/patches/server/0287-force-entity-dismount-during-teleportation.patch +++ b/patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3f9f7faeaa33a4f5d55812d6964496c0b9c8abb4..a84e4d7760efd36846ef8619bfabc12629bed940 100644 +index f2d9a475c9e7eb5a9bccdc74f1e361c440285749..4f851879aaea3b604e45c2f608edd3c2972bd038 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1366,11 +1366,13 @@ public class ServerPlayer extends Player { @@ -93,7 +93,7 @@ index 5116be3075c1249254524bf6a5b6bc28c61400e6..6d7632ca9b8b63be637c89b374b8769a if (this.valid) { Bukkit.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3cb7bca86c6b0696db7ad156d09e29e9da8cc7e7..cb53fc775df387e8bbb099517793daea5ea15e4b 100644 +index bd430a0bc14d5b1b991a0061e50223dd4ad208c2..3989a06970c896fedcd912eeaaca8945e3067858 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3432,9 +3432,15 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0288-Add-more-Zombie-API.patch b/patches/unapplied/server/0288-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0288-Add-more-Zombie-API.patch rename to patches/unapplied/server/0288-Add-more-Zombie-API.patch diff --git a/patches/server/0289-Book-Size-Limits.patch b/patches/unapplied/server/0289-Book-Size-Limits.patch similarity index 96% rename from patches/server/0289-Book-Size-Limits.patch rename to patches/unapplied/server/0289-Book-Size-Limits.patch index 8ee257b136..435355d419 100644 --- a/patches/server/0289-Book-Size-Limits.patch +++ b/patches/unapplied/server/0289-Book-Size-Limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 65da9e37ac3f8bfb1ed36bd3511687c3efac3d91..e6b1df963db0f5022e57dfc4179389b010cebe5c 100644 +index e143fb922a0351f3fbf5c0c208916930a772c006..dcaa912fc785620d0458a35144becd0ae0a552d7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1116,6 +1116,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0290-Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0291-Prevent-Enderman-from-loading-chunks.patch rename to patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 91% rename from patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 8c70f3d476..8042fdbbd2 100644 --- a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4680b02295eb231ac90b84734c8d6989f29fa16c..8a1014490ae4ddf24010b2efae8051277e64b849 100644 +index c0ba5e308d8ef8333eeea6217f95022cf59c76b7..d6aa16ccb18e1aac0e2c59e3fb83bea87572aa7c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1609,6 +1609,13 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0295-BlockDestroyEvent.patch b/patches/unapplied/server/0295-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0295-BlockDestroyEvent.patch rename to patches/unapplied/server/0295-BlockDestroyEvent.patch diff --git a/patches/server/0296-Async-command-map-building.patch b/patches/unapplied/server/0296-Async-command-map-building.patch similarity index 100% rename from patches/server/0296-Async-command-map-building.patch rename to patches/unapplied/server/0296-Async-command-map-building.patch diff --git a/patches/server/0297-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch similarity index 98% rename from patches/server/0297-Implement-Brigadier-Mojang-API.patch rename to patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch index 00803b0317..4d9c868921 100644 --- a/patches/server/0297-Implement-Brigadier-Mojang-API.patch +++ b/patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index 5768077db6c85f05bbab99b08ab39efff99e2692..bba43db4bdde5e40a316f7f94009d41cca12fa6c 100644 +index d2b45b70f4951e44b34a67e29d008748ba84a6bf..243e40cb0e14f62e284fc272aeb0b6a1bc54ea9f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,6 +8,7 @@ plugins { @@ -131,7 +131,7 @@ index b21bcb046ec801a4cb5395034be60d0eb19888eb..2f256d0452617c8f2630f0dd8f16025c if (commandnode2.canUse(source)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e6b1df963db0f5022e57dfc4179389b010cebe5c..9ebe4ccd3ac092a945024fe69e4e48413809c7b4 100644 +index dcaa912fc785620d0458a35144becd0ae0a552d7..8c773cfefbe14f74db455594ec833ca62d7b9e74 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -828,8 +828,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0299-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch similarity index 97% rename from patches/server/0299-Limit-Client-Sign-length-more.patch rename to patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch index b9a6fbf37d..e25c204940 100644 --- a/patches/server/0299-Limit-Client-Sign-length-more.patch +++ b/patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9ebe4ccd3ac092a945024fe69e4e48413809c7b4..f18c32e5f100bebbc404f2326f53d906305fc223 100644 +index 8c773cfefbe14f74db455594ec833ca62d7b9e74..461bfd99b303fcf7ce6d7ee53184605313f48b10 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0304-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0304-Entity-getEntitySpawnReason.patch rename to patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0305-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0305-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0305-Fire-event-on-GS4-query.patch rename to patches/unapplied/server/0305-Fire-event-on-GS4-query.patch diff --git a/patches/server/0306-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0306-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0306-Implement-PlayerPostRespawnEvent.patch rename to patches/unapplied/server/0306-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/unapplied/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0308-Server-Tick-Events.patch b/patches/unapplied/server/0308-Server-Tick-Events.patch similarity index 100% rename from patches/server/0308-Server-Tick-Events.patch rename to patches/unapplied/server/0308-Server-Tick-Events.patch diff --git a/patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0309-PlayerDeathEvent-getItemsToKeep.patch similarity index 96% rename from patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/server/0309-PlayerDeathEvent-getItemsToKeep.patch index 67c471c868..372ac97549 100644 --- a/patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch +++ b/patches/unapplied/server/0309-PlayerDeathEvent-getItemsToKeep.patch @@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 public net.minecraft.world.entity.player.Inventory compartments diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8a1014490ae4ddf24010b2efae8051277e64b849..b8fba7ed700b53ef14747fa61c1c367ec98a6328 100644 +index d6aa16ccb18e1aac0e2c59e3fb83bea87572aa7c..e5b04fc62588a8b128fa32e5cd270f3103a6c95e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -798,6 +798,46 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0310-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch rename to patches/unapplied/server/0310-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0311-Add-Heightmap-API.patch b/patches/unapplied/server/0311-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0311-Add-Heightmap-API.patch rename to patches/unapplied/server/0311-Add-Heightmap-API.patch diff --git a/patches/server/0312-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0312-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0312-Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/server/0312-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 91% rename from patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/unapplied/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch index 82c3ee41ed..5f07ff9e39 100644 --- a/patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/patches/unapplied/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f18c32e5f100bebbc404f2326f53d906305fc223..df967f84f44584ee2fed79009c65d8930500273c 100644 +index 461bfd99b303fcf7ce6d7ee53184605313f48b10..c8dd695a4fe41785acd34dc6dd02810202a55d5c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -511,7 +511,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/unapplied/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0315-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0315-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0315-Implement-CraftBlockSoundGroup.patch rename to patches/unapplied/server/0315-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/unapplied/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0317-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch rename to patches/unapplied/server/0317-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0318-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0318-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0318-Expose-the-internal-current-tick.patch rename to patches/unapplied/server/0318-Expose-the-internal-current-tick.patch diff --git a/patches/server/0319-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0319-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0319-Fix-World-isChunkGenerated-calls.patch rename to patches/unapplied/server/0319-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/unapplied/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/unapplied/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0322-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0322-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0322-Configurable-projectile-relative-velocity.patch rename to patches/unapplied/server/0322-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0323-offset-item-frame-ticking.patch b/patches/unapplied/server/0323-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0323-offset-item-frame-ticking.patch rename to patches/unapplied/server/0323-offset-item-frame-ticking.patch diff --git a/patches/server/0324-Fix-MC-158900.patch b/patches/unapplied/server/0324-Fix-MC-158900.patch similarity index 100% rename from patches/server/0324-Fix-MC-158900.patch rename to patches/unapplied/server/0324-Fix-MC-158900.patch diff --git a/patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0325-Prevent-consuming-the-wrong-itemstack.patch similarity index 95% rename from patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch rename to patches/unapplied/server/0325-Prevent-consuming-the-wrong-itemstack.patch index 8b387c724e..27571f55a3 100644 --- a/patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch +++ b/patches/unapplied/server/0325-Prevent-consuming-the-wrong-itemstack.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index cb53fc775df387e8bbb099517793daea5ea15e4b..ba4e0bac019b68da166b277028015999139d2981 100644 +index 3989a06970c896fedcd912eeaaca8945e3067858..66e8231d2a717ceed7c39b87809a3fd40d644963 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3649,9 +3649,14 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0326-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0326-Dont-send-unnecessary-sign-update.patch similarity index 92% rename from patches/server/0326-Dont-send-unnecessary-sign-update.patch rename to patches/unapplied/server/0326-Dont-send-unnecessary-sign-update.patch index 9508afcd70..9d63a246b8 100644 --- a/patches/server/0326-Dont-send-unnecessary-sign-update.patch +++ b/patches/unapplied/server/0326-Dont-send-unnecessary-sign-update.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index df967f84f44584ee2fed79009c65d8930500273c..65a928907c7a5df39d2596286860c6798c13910a 100644 +index c8dd695a4fe41785acd34dc6dd02810202a55d5c..bae36fdcab69b27be03d4df6cb24912c6884340c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3220,6 +3220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0327-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0327-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0327-Add-option-to-disable-pillager-patrols.patch rename to patches/unapplied/server/0327-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0328-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0328-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0328-Flat-bedrock-generator-settings.patch rename to patches/unapplied/server/0328-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/unapplied/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/unapplied/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0331-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0331-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0331-Duplicate-UUID-Resolve-Option.patch rename to patches/unapplied/server/0331-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0332-Optimize-Hoppers.patch b/patches/unapplied/server/0332-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0332-Optimize-Hoppers.patch rename to patches/unapplied/server/0332-Optimize-Hoppers.patch diff --git a/patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0333-PlayerDeathEvent-shouldDropExperience.patch similarity index 91% rename from patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/server/0333-PlayerDeathEvent-shouldDropExperience.patch index 0bc11f1314..ff037a1d2b 100644 --- a/patches/server/0333-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/unapplied/server/0333-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b8fba7ed700b53ef14747fa61c1c367ec98a6328..9265ef8bc10f29410b78ea2555107800c5566cbf 100644 +index e5b04fc62588a8b128fa32e5cd270f3103a6c95e..70b92f95a3b1964a6253e64854d7d7d65ed5311f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -918,7 +918,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/unapplied/server/0334-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/unapplied/server/0335-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/unapplied/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/unapplied/server/0337-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0338-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0338-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0338-Fix-items-not-falling-correctly.patch rename to patches/unapplied/server/0338-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0339-Lag-compensate-eating.patch b/patches/unapplied/server/0339-Lag-compensate-eating.patch similarity index 97% rename from patches/server/0339-Lag-compensate-eating.patch rename to patches/unapplied/server/0339-Lag-compensate-eating.patch index 0e2c67e8b1..4a3bd47707 100644 --- a/patches/server/0339-Lag-compensate-eating.patch +++ b/patches/unapplied/server/0339-Lag-compensate-eating.patch @@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ba4e0bac019b68da166b277028015999139d2981..b448a7b6318311ce3542e49a2f1670ccac77c215 100644 +index 66e8231d2a717ceed7c39b87809a3fd40d644963..4089ab947e144642bd6407bf6bef2e3b4a94a0e0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3592,6 +3592,11 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0340-Optimize-call-to-getFluid-for-explosions.patch similarity index 91% rename from patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch rename to patches/unapplied/server/0340-Optimize-call-to-getFluid-for-explosions.patch index 85405d5c01..92782825a1 100644 --- a/patches/server/0340-Optimize-call-to-getFluid-for-explosions.patch +++ b/patches/unapplied/server/0340-Optimize-call-to-getFluid-for-explosions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index c4f1b98de5b7db95ca886c0f8b7b893428e1b460..cc8dcb77f2b6d447c0e8d769a3d233dc2eb64efa 100644 +index a9f45dbc2997c4deeba932d04a52e21f4dbfea95..1582f8aad002c14ed45a5748e99f259896e8c9e9 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -168,7 +168,7 @@ public class Explosion { diff --git a/patches/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/unapplied/server/0341-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0342-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0342-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0342-Entity-Activation-Range-2.0.patch rename to patches/unapplied/server/0342-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0343-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0343-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0343-Increase-Light-Queue-Size.patch rename to patches/unapplied/server/0343-Increase-Light-Queue-Size.patch diff --git a/patches/server/0344-Anti-Xray.patch b/patches/unapplied/server/0344-Anti-Xray.patch similarity index 100% rename from patches/server/0344-Anti-Xray.patch rename to patches/unapplied/server/0344-Anti-Xray.patch diff --git a/patches/server/0345-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0345-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0345-Implement-alternative-item-despawn-rate.patch rename to patches/unapplied/server/0345-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0346-Tracking-Range-Improvements.patch b/patches/unapplied/server/0346-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0346-Tracking-Range-Improvements.patch rename to patches/unapplied/server/0346-Tracking-Range-Improvements.patch diff --git a/patches/server/0347-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0347-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0347-Fix-items-vanishing-through-end-portal.patch rename to patches/unapplied/server/0347-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0348-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0348-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0348-implement-optional-per-player-mob-spawns.patch rename to patches/unapplied/server/0348-implement-optional-per-player-mob-spawns.patch index 116511d3b1..88bdcb42e8 100644 --- a/patches/server/0348-implement-optional-per-player-mob-spawns.patch +++ b/patches/unapplied/server/0348-implement-optional-per-player-mob-spawns.patch @@ -362,7 +362,7 @@ index c021733342c09adb04ce3f675209543f84ac4bda..d137aa95f670aab516e9e08272f33b21 this.lastSpawnState = spawnercreature_d; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9265ef8bc10f29410b78ea2555107800c5566cbf..4a25bd069bdfc6bd35e05cc86a392edad902ab11 100644 +index 70b92f95a3b1964a6253e64854d7d7d65ed5311f..796ae37215856a511b72e7d1355f672a8c5a4566 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -240,6 +240,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/unapplied/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0350-Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/0350-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0350-Improve-Block-breakNaturally-API.patch rename to patches/unapplied/server/0350-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/unapplied/server/0351-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0352-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0352-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0352-Add-debug-for-sync-chunk-loads.patch rename to patches/unapplied/server/0352-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0353-Remove-garbage-Java-version-check.patch b/patches/unapplied/server/0353-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0353-Remove-garbage-Java-version-check.patch rename to patches/unapplied/server/0353-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0354-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0354-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0354-Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/0354-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0355-Entity-Jump-API.patch b/patches/unapplied/server/0355-Entity-Jump-API.patch similarity index 97% rename from patches/server/0355-Entity-Jump-API.patch rename to patches/unapplied/server/0355-Entity-Jump-API.patch index ccab888881..66829e5c60 100644 --- a/patches/server/0355-Entity-Jump-API.patch +++ b/patches/unapplied/server/0355-Entity-Jump-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b448a7b6318311ce3542e49a2f1670ccac77c215..9621438358c85cf66c756f0d53bcd89f4f0ec933 100644 +index 4089ab947e144642bd6407bf6bef2e3b4a94a0e0..fd1637608b89e1f5af884410cd804c4bfc158c41 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3264,8 +3264,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/unapplied/server/0356-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0357-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0357-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0357-Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/0357-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0358-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0358-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0358-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/0358-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0359-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0359-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0359-Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/0359-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/unapplied/server/0360-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0361-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0361-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0361-Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/0361-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0362-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0362-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0362-Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/0362-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/unapplied/server/0363-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0364-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0364-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0364-Add-tick-times-API-and-mspt-command.patch rename to patches/unapplied/server/0364-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0365-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0365-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0365-Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/0365-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/0366-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/unapplied/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch index a238fa8613..9b920cb7a8 100644 --- a/patches/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/unapplied/server/0367-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4a25bd069bdfc6bd35e05cc86a392edad902ab11..d8bdd5e66d8019ec2a318141eb135a2028682624 100644 +index 796ae37215856a511b72e7d1355f672a8c5a4566..23bac54d7cc2938c8a3f1a8dbb97fea18047a809 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -236,6 +236,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/unapplied/server/0368-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/unapplied/server/0369-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/0370-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0371-Don-t-tick-dead-players.patch b/patches/unapplied/server/0371-Don-t-tick-dead-players.patch similarity index 91% rename from patches/server/0371-Don-t-tick-dead-players.patch rename to patches/unapplied/server/0371-Don-t-tick-dead-players.patch index 208efe70c7..2b651ac45d 100644 --- a/patches/server/0371-Don-t-tick-dead-players.patch +++ b/patches/unapplied/server/0371-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d8bdd5e66d8019ec2a318141eb135a2028682624..155dcb0f100d847e8d0ebd219747d3fb30dc9999 100644 +index 23bac54d7cc2938c8a3f1a8dbb97fea18047a809..cbf11122d5cc43b057d72cc989e7b73615f9fb54 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -675,7 +675,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/unapplied/server/0372-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0373-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0373-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0373-Optimize-Collision-to-not-load-chunks.patch rename to patches/unapplied/server/0373-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0374-Don-t-move-existing-players-to-world-spawn.patch similarity index 96% rename from patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch rename to patches/unapplied/server/0374-Don-t-move-existing-players-to-world-spawn.patch index 4a905dfca5..69a246e3fd 100644 --- a/patches/server/0374-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/unapplied/server/0374-Don-t-move-existing-players-to-world-spawn.patch @@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start. public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 155dcb0f100d847e8d0ebd219747d3fb30dc9999..318bbc94726456049336aeba0a048c577eaa0614 100644 +index cbf11122d5cc43b057d72cc989e7b73615f9fb54..94a50cd836ea5400a0e65a388074c5a7cfbb27cc 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -328,7 +328,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/unapplied/server/0375-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0376-Improved-Watchdog-Support.patch b/patches/unapplied/server/0376-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0376-Improved-Watchdog-Support.patch rename to patches/unapplied/server/0376-Improved-Watchdog-Support.patch index 46d637738c..fdfb4c4f6b 100644 --- a/patches/server/0376-Improved-Watchdog-Support.patch +++ b/patches/unapplied/server/0376-Improved-Watchdog-Support.patch @@ -318,7 +318,7 @@ index 1c618cfb63561f4557f8ec71254b6397eb9cc485..6e95a98727322106d2c418de80f5f0aa final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 4f666a16a46d86cd0919bbe8f8b918a7f451d254..f7c8d25830ed701e72f828fa73066a6e9188253b 100644 +index 08e74f41516a545a2371a7418d995ab288831834..cce6886bb3973eed8f0c7ca7b1189547324fd4e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,6 +12,8 @@ import java.util.logging.Level; diff --git a/patches/server/0377-Optimize-Pathfinding.patch b/patches/unapplied/server/0377-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0377-Optimize-Pathfinding.patch rename to patches/unapplied/server/0377-Optimize-Pathfinding.patch diff --git a/patches/server/0378-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0378-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0378-Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/0378-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0379-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0379-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0379-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/unapplied/server/0379-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0380-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0380-Prevent-opening-inventories-when-frozen.patch similarity index 97% rename from patches/server/0380-Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/0380-Prevent-opening-inventories-when-frozen.patch index 7265543305..1eee231cca 100644 --- a/patches/server/0380-Prevent-opening-inventories-when-frozen.patch +++ b/patches/unapplied/server/0380-Prevent-opening-inventories-when-frozen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 318bbc94726456049336aeba0a048c577eaa0614..af55a0cc48e505ac55445ef8cc6495c68d0757c8 100644 +index 94a50cd836ea5400a0e65a388074c5a7cfbb27cc..6fd27b00bac756654c29955f1e5fe921687ab3f3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -644,7 +644,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 95% rename from patches/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/unapplied/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch index fc20c611bf..83c68e09f6 100644 --- a/patches/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/unapplied/server/0381-Don-t-run-entity-collision-code-if-not-needed.patch @@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide. Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9621438358c85cf66c756f0d53bcd89f4f0ec933..ba11b19658cc1112de7c784637d053b68177b269 100644 +index fd1637608b89e1f5af884410cd804c4bfc158c41..b27959da01866910da7c1197c6675da87bb181c4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3364,10 +3364,24 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0382-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0382-Implement-Player-Client-Options-API.patch similarity index 97% rename from patches/server/0382-Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/0382-Implement-Player-Client-Options-API.patch index 6920828cfe..4ecfed8b2b 100644 --- a/patches/server/0382-Implement-Player-Client-Options-API.patch +++ b/patches/unapplied/server/0382-Implement-Player-Client-Options-API.patch @@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index af55a0cc48e505ac55445ef8cc6495c68d0757c8..4a4f829e9cf984a6f129548cdf1316823ce146cb 100644 +index 6fd27b00bac756654c29955f1e5fe921687ab3f3..596611c852d1b2b98fdae26d6bd75c3bce9d1984 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1885,9 +1885,24 @@ public class ServerPlayer extends Player { @@ -116,7 +116,7 @@ index af55a0cc48e505ac55445ef8cc6495c68d0757c8..4a4f829e9cf984a6f129548cdf131682 if (getMainArm() != packet.mainHand()) { PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 727ed31aefa4e0893a03afd4b90b01ad6ed51ce4..4592cac06c8e96d4677ba315f70d5336fcdd0558 100644 +index d21faa3e7a97c28e380323b503d32de5e5705d11..7dfa2ce4028b7ab3b1ebe063f497b8adda397079 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -617,6 +617,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/unapplied/server/0383-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 98% rename from patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/unapplied/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index ad97903d4c..da97c8d19c 100644 --- a/patches/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/unapplied/server/0384-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -43,7 +43,7 @@ index b2e95249ee5aa37d5e41679a7cb94e01c1b41494..11a4ba46869e3073375d85820426f066 if (!(entity instanceof EnderDragonPart)) { EntityType entitytypes = entity.getType(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4a4f829e9cf984a6f129548cdf1316823ce146cb..33b6f23f483535714fc020da47c79fca33271c62 100644 +index 596611c852d1b2b98fdae26d6bd75c3bce9d1984..d7cce55b968e01641c46b7eae396393b6ff572e5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -259,6 +259,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/unapplied/server/0385-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch index 8e233aa04a..b5b05a14d6 100644 --- a/patches/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/unapplied/server/0386-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ba11b19658cc1112de7c784637d053b68177b269..8371e37705c871f3b4bef0ffcf0a0bbb50a1c783 100644 +index b27959da01866910da7c1197c6675da87bb181c4..03cdd8aa2f2e8a5a5637ea5cbfbdde55135240eb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2128,7 +2128,16 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/unapplied/server/0387-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0388-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0388-Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/0388-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 98% rename from patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/unapplied/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch index fe7ad6c372..82feacb91c 100644 --- a/patches/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/unapplied/server/0389-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -80,7 +80,7 @@ index 7e8d434944596b4d82675448ddff4046a1b0b4b4..462159a70eb92f463b25ef840656a8f8 public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8371e37705c871f3b4bef0ffcf0a0bbb50a1c783..b26b598678ea474b3abc67acebdbed9b278e89bc 100644 +index 03cdd8aa2f2e8a5a5637ea5cbfbdde55135240eb..8cea2de440c1f45e376067c1adda3ea67dce2fe5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1647,9 +1647,9 @@ public abstract class LivingEntity extends Entity { @@ -113,7 +113,7 @@ index 8371e37705c871f3b4bef0ffcf0a0bbb50a1c783..b26b598678ea474b3abc67acebdbed9b this.drops = new ArrayList<>(); // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index e463ae13ce6f65675c2b6d553ecf91db5a047dbc..7ff1e7e4d493770bfdbc0ad5e8f10387cefc42d2 100644 +index 4edd48ce10caf31ac0136af35f19836b555675e5..d7bb93cd6467fe5d1cb1a9b95fa0bc3b31ba9cd2 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -609,7 +609,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0390-Villager-Restocks-API.patch b/patches/unapplied/server/0390-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0390-Villager-Restocks-API.patch rename to patches/unapplied/server/0390-Villager-Restocks-API.patch diff --git a/patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/unapplied/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch index 9d8cd57f8a..bf7d3cb9e7 100644 --- a/patches/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/unapplied/server/0391-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 65a928907c7a5df39d2596286860c6798c13910a..069d5ee0aa0921240d85fa0fc12e9e355dbf21e9 100644 +index bae36fdcab69b27be03d4df6cb24912c6884340c..7aea69bac0bc533380cebad8ef6b20a3a1442d69 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -955,7 +955,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0392-Expose-game-version.patch b/patches/unapplied/server/0392-Expose-game-version.patch similarity index 100% rename from patches/server/0392-Expose-game-version.patch rename to patches/unapplied/server/0392-Expose-game-version.patch diff --git a/patches/server/0393-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0393-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0393-Optimize-Voxel-Shape-Merging.patch rename to patches/unapplied/server/0393-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/unapplied/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index dd28cd0b5d..6e0cb176e9 100644 --- a/patches/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/unapplied/server/0394-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index f7c8d25830ed701e72f828fa73066a6e9188253b..4714e0199987d864b37aaec94ffa885a5b76b437 100644 +index cce6886bb3973eed8f0c7ca7b1189547324fd4e2..0aef4fc4a89e627bc80504d7402f1ca2cdc95a74 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -28,6 +28,7 @@ public class Main { diff --git a/patches/server/0395-misc-debugging-dumps.patch b/patches/unapplied/server/0395-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0395-misc-debugging-dumps.patch rename to patches/unapplied/server/0395-misc-debugging-dumps.patch diff --git a/patches/server/0396-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0396-Prevent-teleporting-dead-entities.patch similarity index 92% rename from patches/server/0396-Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/0396-Prevent-teleporting-dead-entities.patch index ea72094b65..2e653920bc 100644 --- a/patches/server/0396-Prevent-teleporting-dead-entities.patch +++ b/patches/unapplied/server/0396-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 069d5ee0aa0921240d85fa0fc12e9e355dbf21e9..d95b9f70a365e7bfa9b36738dd56dcad891b0525 100644 +index 7aea69bac0bc533380cebad8ef6b20a3a1442d69..ec31ca45c7e95aea3ff8d1be690c96dfae470c81 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1621,6 +1621,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/unapplied/server/0397-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0398-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0398-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0398-Implement-Mob-Goal-API.patch rename to patches/unapplied/server/0398-Implement-Mob-Goal-API.patch index afb60a1c40..d81f141782 100644 --- a/patches/server/0398-Implement-Mob-Goal-API.patch +++ b/patches/unapplied/server/0398-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 54b55e0691e6169017a988074a9f3a52703d0839..0f4162f47cea792696271b7157c95c399d2c3567 100644 +index daf75df1e515511fd28ed555c2c0c8ea70ec47dd..dbaff3f2505f09e87bea314bb179a408eebd2e7c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { diff --git a/patches/server/0399-Add-villager-reputation-API.patch b/patches/unapplied/server/0399-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0399-Add-villager-reputation-API.patch rename to patches/unapplied/server/0399-Add-villager-reputation-API.patch diff --git a/patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/unapplied/server/0400-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0401-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0401-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0401-ExperienceOrbMergeEvent.patch rename to patches/unapplied/server/0401-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0402-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0402-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/0402-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0403-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0403-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0403-Optimize-brigadier-child-sorting-performance.patch rename to patches/unapplied/server/0403-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0404-Potential-bed-API.patch b/patches/unapplied/server/0404-Potential-bed-API.patch similarity index 100% rename from patches/server/0404-Potential-bed-API.patch rename to patches/unapplied/server/0404-Potential-bed-API.patch diff --git a/patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0405-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0405-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/0405-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/unapplied/server/0406-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/unapplied/server/0407-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/unapplied/server/0408-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/unapplied/server/0409-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0410-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0410-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0410-Ensure-safe-gateway-teleport.patch rename to patches/unapplied/server/0410-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0411-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0411-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0411-Add-option-for-console-having-all-permissions.patch rename to patches/unapplied/server/0411-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 99% rename from patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/unapplied/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch index 6f37414684..9fa3d02fb6 100644 --- a/patches/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch +++ b/patches/unapplied/server/0412-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch @@ -333,7 +333,7 @@ index 665e088cb0b73f6a0c62f29c56da462bab7c927e..298e4468f7b5346733257f7117f76c66 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 33b6f23f483535714fc020da47c79fca33271c62..35d28066295bfbdac3f35b0565ea658bd20de892 100644 +index d7cce55b968e01641c46b7eae396393b6ff572e5..e944729f35768ee7fbb85520fae532c0ab4be548 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -264,6 +264,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0413-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/unapplied/server/0413-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0414-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0414-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0414-Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/0414-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0415-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0415-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0415-Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/0415-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/unapplied/server/0416-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/0417-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/0418-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0419-Fix-sand-duping.patch b/patches/unapplied/server/0419-Fix-sand-duping.patch similarity index 100% rename from patches/server/0419-Fix-sand-duping.patch rename to patches/unapplied/server/0419-Fix-sand-duping.patch diff --git a/patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/unapplied/server/0420-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/unapplied/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch index e0e651415c..4989b13246 100644 --- a/patches/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/unapplied/server/0421-Prevent-position-desync-in-playerconnection-causing-.patch @@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d95b9f70a365e7bfa9b36738dd56dcad891b0525..700dcbfb114b147c22a44b9960728c9f68db0a70 100644 +index ec31ca45c7e95aea3ff8d1be690c96dfae470c81..eca6493287e46e2b9457d5a3a24dd8c1ca8acd6c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1434,6 +1434,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0422-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0422-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/0422-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0423-Improve-Arrow-API.patch b/patches/unapplied/server/0423-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0423-Improve-Arrow-API.patch rename to patches/unapplied/server/0423-Improve-Arrow-API.patch diff --git a/patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 95% rename from patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch index af928b76fd..8512277e7a 100644 --- a/patches/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch +++ b/patches/unapplied/server/0424-Add-and-implement-PlayerRecipeBookClickEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 700dcbfb114b147c22a44b9960728c9f68db0a70..fab792e1c8285248c23f5ffed1e0dbe80671608d 100644 +index eca6493287e46e2b9457d5a3a24dd8c1ca8acd6c..5e2dbde58deb8de7186f13468d51824082424451 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3098,9 +3098,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0425-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0425-Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/0425-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0426-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0426-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0426-Add-permission-for-command-blocks.patch rename to patches/unapplied/server/0426-Add-permission-for-command-blocks.patch index ac7eaab661..0c73b52520 100644 --- a/patches/server/0426-Add-permission-for-command-blocks.patch +++ b/patches/unapplied/server/0426-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index aee5144bdc5bd9f7b07ce3b72331bcfd42663ec9..a98254e38076e82f94db7b2f2112500e return false; } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fab792e1c8285248c23f5ffed1e0dbe80671608d..fa06f9be742103e65aa90dfb9d21a93c119bf0c0 100644 +index 5e2dbde58deb8de7186f13468d51824082424451..cdf72c506442c6cb9ab0e0856b429cdb90fc38cc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -866,7 +866,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/unapplied/server/0427-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 97% rename from patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 2378747034..e3bb2cdeea 100644 --- a/patches/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/unapplied/server/0428-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -76,7 +76,7 @@ index 771677c0e1cd7bfe089b9a5bb9095650216ff588..520cd1a6b347687b2ec6d13f034be391 @Override diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 35d28066295bfbdac3f35b0565ea658bd20de892..fcd3f4259989a004fcfc5270b2b95c81454ed01b 100644 +index e944729f35768ee7fbb85520fae532c0ab4be548..425fd68d3a20aba52af7462bf91e15114978e42b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1149,7 +1149,7 @@ public class ServerPlayer extends Player { @@ -89,7 +89,7 @@ index 35d28066295bfbdac3f35b0565ea658bd20de892..fcd3f4259989a004fcfc5270b2b95c81 playerlist.sendPlayerPermissionLevel(this); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fa06f9be742103e65aa90dfb9d21a93c119bf0c0..d5f879303080dadf0fbd5d15840c2536942c6d0b 100644 +index cdf72c506442c6cb9ab0e0856b429cdb90fc38cc..75519699066f93c10b2d1affee651bd0bf7e482b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3373,7 +3373,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0429-Paper-dumpitem-command.patch b/patches/unapplied/server/0429-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0429-Paper-dumpitem-command.patch rename to patches/unapplied/server/0429-Paper-dumpitem-command.patch diff --git a/patches/server/0430-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0430-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0430-Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/0430-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0431-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0431-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0431-Optimize-Bit-Operations-by-inlining.patch rename to patches/unapplied/server/0431-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/unapplied/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0433-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0433-incremental-chunk-and-player-saving.patch similarity index 98% rename from patches/server/0433-incremental-chunk-and-player-saving.patch rename to patches/unapplied/server/0433-incremental-chunk-and-player-saving.patch index 6bef0be0fd..6ce6b943cd 100644 --- a/patches/server/0433-incremental-chunk-and-player-saving.patch +++ b/patches/unapplied/server/0433-incremental-chunk-and-player-saving.patch @@ -115,7 +115,7 @@ index 44ca46e7dff19ae99ff6cf0d82269c5f7ad7274a..95c53189e32aec6aca254fa3b157df7b // Paper start - rewrite chunk system - add close param this.save(progressListener, flush, savingDisabled, false); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index fcd3f4259989a004fcfc5270b2b95c81454ed01b..e6b175a62f2b151068fc7b28685b64afea1ebbc3 100644 +index 425fd68d3a20aba52af7462bf91e15114978e42b..f2185620a76b0b376adca38a5db950a327abc897 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -181,6 +181,7 @@ import org.bukkit.inventory.MainHand; diff --git a/patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/unapplied/server/0434-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0435-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0435-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0435-Support-old-UUID-format-for-NBT.patch rename to patches/unapplied/server/0435-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0436-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0436-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/unapplied/server/0436-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0437-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0437-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/0437-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0438-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0438-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0438-Remove-some-streams-from-structures.patch rename to patches/unapplied/server/0438-Remove-some-streams-from-structures.patch diff --git a/patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0439-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0439-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/unapplied/server/0439-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0440-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0440-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0440-Support-components-in-ItemMeta.patch rename to patches/unapplied/server/0440-Support-components-in-ItemMeta.patch diff --git a/patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/unapplied/server/0441-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0442-Add-entity-liquid-API.patch b/patches/unapplied/server/0442-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0442-Add-entity-liquid-API.patch rename to patches/unapplied/server/0442-Add-entity-liquid-API.patch diff --git a/patches/server/0443-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0443-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0443-Update-itemstack-legacy-name-and-lore.patch rename to patches/unapplied/server/0443-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0444-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0444-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0444-Spawn-player-in-correct-world-on-login.patch rename to patches/unapplied/server/0444-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0445-Add-PrepareResultEvent.patch b/patches/unapplied/server/0445-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0445-Add-PrepareResultEvent.patch rename to patches/unapplied/server/0445-Add-PrepareResultEvent.patch diff --git a/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 90% rename from patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/unapplied/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index e9b0665218..a17ad58ea2 100644 --- a/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/unapplied/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b26b598678ea474b3abc67acebdbed9b278e89bc..2ce769b00798f35095f50380083c7cbf4de462ef 100644 +index 8cea2de440c1f45e376067c1adda3ea67dce2fe5..408d5ccfe450a4f12d9cc37d15dbc6e817c49cca 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3471,7 +3471,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0447-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/0447-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/unapplied/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/unapplied/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0449-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/0449-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0451-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0451-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0451-Fix-SPIGOT-5989.patch rename to patches/unapplied/server/0451-Fix-SPIGOT-5989.patch diff --git a/patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/unapplied/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/unapplied/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/unapplied/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0455-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0455-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0455-Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/0455-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/unapplied/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/unapplied/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0458-Brand-support.patch b/patches/unapplied/server/0458-Brand-support.patch similarity index 100% rename from patches/server/0458-Brand-support.patch rename to patches/unapplied/server/0458-Brand-support.patch diff --git a/patches/server/0459-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0459-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0459-Add-setMaxPlayers-API.patch rename to patches/unapplied/server/0459-Add-setMaxPlayers-API.patch diff --git a/patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0461-Don-t-require-FACING-data.patch b/patches/unapplied/server/0461-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0461-Don-t-require-FACING-data.patch rename to patches/unapplied/server/0461-Don-t-require-FACING-data.patch diff --git a/patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/unapplied/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0463-Add-moon-phase-API.patch b/patches/unapplied/server/0463-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0463-Add-moon-phase-API.patch rename to patches/unapplied/server/0463-Add-moon-phase-API.patch diff --git a/patches/server/0464-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0464-Prevent-headless-pistons-from-being-created.patch similarity index 95% rename from patches/server/0464-Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/0464-Prevent-headless-pistons-from-being-created.patch index 60b7241583..327de3dc8b 100644 --- a/patches/server/0464-Prevent-headless-pistons-from-being-created.patch +++ b/patches/unapplied/server/0464-Prevent-headless-pistons-from-being-created.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created Prevent headless pistons from being created by explosions or tree/mushroom growth. diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 0a2f5e929d34c933755e9bc4b205e1b2ad0ce3bc..f607c40cde7ac2a79ee2cfd618c0c11abbab6e46 100644 +index 4eb2b90596d2a538c1ea380f11fcd23f2465d611..092ba9e1f5bf331d65b549d54689b337e67a6d58 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -183,6 +183,15 @@ public class Explosion { diff --git a/patches/server/0465-Add-BellRingEvent.patch b/patches/unapplied/server/0465-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0465-Add-BellRingEvent.patch rename to patches/unapplied/server/0465-Add-BellRingEvent.patch diff --git a/patches/server/0466-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0466-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0466-Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/0466-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0467-Buffer-joins-to-world.patch b/patches/unapplied/server/0467-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0467-Buffer-joins-to-world.patch rename to patches/unapplied/server/0467-Buffer-joins-to-world.patch diff --git a/patches/server/0468-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0468-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0468-Eigencraft-redstone-implementation.patch rename to patches/unapplied/server/0468-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/unapplied/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/unapplied/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0471-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0471-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0471-Fix-CraftTeam-null-check.patch rename to patches/unapplied/server/0471-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0472-Add-more-Evoker-API.patch b/patches/unapplied/server/0472-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0472-Add-more-Evoker-API.patch rename to patches/unapplied/server/0472-Add-more-Evoker-API.patch diff --git a/patches/server/0473-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0473-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0473-Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/0473-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0475-Cache-block-data-strings.patch b/patches/unapplied/server/0475-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0475-Cache-block-data-strings.patch rename to patches/unapplied/server/0475-Cache-block-data-strings.patch diff --git a/patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 98% rename from patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/unapplied/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 288d3d614e..927680565b 100644 --- a/patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/unapplied/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 473944ad4f317dcb8d0a0ec9dcc736dfc04ae382..f365eaa38b9aa2331ab51374886021bc3c2f28c2 100644 +index 3553e36b45fe8c0cce2588bb88137bef269ede66..2de25bb28f0cbbfb46054be36f65c930b6005921 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -748,7 +748,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0477-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/server/0477-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/unapplied/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 96% rename from patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/unapplied/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch index 371ab800cf..3e785bd0e6 100644 --- a/patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/unapplied/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0637fd424e98175f864f15c8bfa8bf696ed47fe7..8866507da8474e4eee767fdf6f83b95c92fb5767 100644 +index b046d08f2c9cc78935e5b75b5367aa45d540465c..32c212861517fef926640dd19f596e6f0cbd8648 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1367,6 +1367,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0481-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/unapplied/server/0481-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0482-Entity-isTicking.patch b/patches/unapplied/server/0482-Entity-isTicking.patch similarity index 100% rename from patches/server/0482-Entity-isTicking.patch rename to patches/unapplied/server/0482-Entity-isTicking.patch diff --git a/patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/unapplied/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/unapplied/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/unapplied/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0486-Fix-for-large-move-vectors-crashing-server.patch similarity index 98% rename from patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch rename to patches/unapplied/server/0486-Fix-for-large-move-vectors-crashing-server.patch index 1ab85dbdea..ed24b836be 100644 --- a/patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/unapplied/server/0486-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f365eaa38b9aa2331ab51374886021bc3c2f28c2..aabfccdd94d5934716a706c9189391177ff07d57 100644 +index 2de25bb28f0cbbfb46054be36f65c930b6005921..8de437fb49ddfa80bb0dc829958d9898d56853c9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -563,9 +563,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0487-Optimise-getType-calls.patch b/patches/unapplied/server/0487-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0487-Optimise-getType-calls.patch rename to patches/unapplied/server/0487-Optimise-getType-calls.patch diff --git a/patches/server/0488-Villager-resetOffers.patch b/patches/unapplied/server/0488-Villager-resetOffers.patch similarity index 100% rename from patches/server/0488-Villager-resetOffers.patch rename to patches/unapplied/server/0488-Villager-resetOffers.patch diff --git a/patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0489-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/unapplied/server/0489-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/unapplied/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0491-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0491-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0491-Fix-item-locations-dropped-from-campfires.patch rename to patches/unapplied/server/0491-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0492-Player-elytra-boost-API.patch b/patches/unapplied/server/0492-Player-elytra-boost-API.patch similarity index 94% rename from patches/server/0492-Player-elytra-boost-API.patch rename to patches/unapplied/server/0492-Player-elytra-boost-API.patch index d6f552f6a8..3ea207af48 100644 --- a/patches/server/0492-Player-elytra-boost-API.patch +++ b/patches/unapplied/server/0492-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b098fcdcadcbf3dac5942a451a16e24b137fa08d..1360082426086a61a657c0cefc7bbc1a7df5f2ec 100644 +index f0146fc5f294a54bbcc2df5eed1082c0809a88b3..b6a7fc3602d7af1de9ecd8eff23a8e7b07d8667f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -639,6 +639,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0493-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0493-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0493-Fixed-TileEntityBell-memory-leak.patch rename to patches/unapplied/server/0493-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/unapplied/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0495-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0495-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0495-Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/server/0495-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0496-Add-ignore-discounts-API.patch b/patches/unapplied/server/0496-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0496-Add-ignore-discounts-API.patch rename to patches/unapplied/server/0496-Add-ignore-discounts-API.patch diff --git a/patches/server/0497-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0497-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0497-Toggle-for-removing-existing-dragon.patch rename to patches/unapplied/server/0497-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0498-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0498-Fix-client-lag-on-advancement-loading.patch similarity index 95% rename from patches/server/0498-Fix-client-lag-on-advancement-loading.patch rename to patches/unapplied/server/0498-Fix-client-lag-on-advancement-loading.patch index 3b86f45c1b..3727a73ec2 100644 --- a/patches/server/0498-Fix-client-lag-on-advancement-loading.patch +++ b/patches/unapplied/server/0498-Fix-client-lag-on-advancement-loading.patch @@ -15,7 +15,7 @@ manually reload the advancement data for all players, which normally takes place as a part of the datapack reloading. diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 26e6fab362db3f5880bb5daddd4795465e969c27..1caee283ae73943f936eddd822fbe64dc7815fdf 100644 +index 75be35b61608a0266fe2b734290077a27f05122b..c05024b813264669d559cf18a15b1a60f427186a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -345,7 +345,13 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0499-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0499-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0499-Item-no-age-no-player-pickup.patch rename to patches/unapplied/server/0499-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/unapplied/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0501-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0501-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0501-Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/server/0501-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0502-Add-API-for-quit-reason.patch b/patches/unapplied/server/0502-Add-API-for-quit-reason.patch similarity index 96% rename from patches/server/0502-Add-API-for-quit-reason.patch rename to patches/unapplied/server/0502-Add-API-for-quit-reason.patch index 3fbbe0ff48..a2d04a2bb1 100644 --- a/patches/server/0502-Add-API-for-quit-reason.patch +++ b/patches/unapplied/server/0502-Add-API-for-quit-reason.patch @@ -25,7 +25,7 @@ index 501d17ba798c5928279a93c45de3eb6e8a3f99d6..5fa1b0d609ffc43b03f66d710a2702c2 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e6b175a62f2b151068fc7b28685b64afea1ebbc3..a56dd127776be6de0e88a356b917488f7b20d39c 100644 +index f2185620a76b0b376adca38a5db950a327abc897..b91f55082d6828dab010cf409218f70186c6d9cc 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -268,6 +268,7 @@ public class ServerPlayer extends Player { @@ -37,7 +37,7 @@ index e6b175a62f2b151068fc7b28685b64afea1ebbc3..a56dd127776be6de0e88a356b917488f public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index aabfccdd94d5934716a706c9189391177ff07d57..51ae3c2facb7a1dbdbc47cd681aeb6a6beb4ed72 100644 +index 8de437fb49ddfa80bb0dc829958d9898d56853c9..7d7e7d10325eab5e107d43b0bc3e6a7b92653fad 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -503,6 +503,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/unapplied/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0504-Expose-world-spawn-angle.patch b/patches/unapplied/server/0504-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0504-Expose-world-spawn-angle.patch rename to patches/unapplied/server/0504-Expose-world-spawn-angle.patch diff --git a/patches/server/0505-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0505-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0505-Add-Destroy-Speed-API.patch rename to patches/unapplied/server/0505-Add-Destroy-Speed-API.patch diff --git a/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/unapplied/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0507-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0507-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0507-Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/server/0507-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0508-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0508-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0508-Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/server/0508-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0509-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch rename to patches/unapplied/server/0509-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0510-More-lightning-API.patch b/patches/unapplied/server/0510-More-lightning-API.patch similarity index 100% rename from patches/server/0510-More-lightning-API.patch rename to patches/unapplied/server/0510-More-lightning-API.patch diff --git a/patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 97% rename from patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/unapplied/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch index b9f348ec80..c33908aa14 100644 --- a/patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/unapplied/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch @@ -45,7 +45,7 @@ index 302676ef78ed5b3b7fc1b04851447ca72eed10c0..a00c3d96f2fc7131d1f4afa7af4e41ac } else if (entity.level.isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) { return false; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2ce769b00798f35095f50380083c7cbf4de462ef..beaf3b3bf4a4373d563b5b75238f79299a304db5 100644 +index 408d5ccfe450a4f12d9cc37d15dbc6e817c49cca..128b4ce85bc8f79a1291d087fdb24e5a083f9464 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3392,7 +3392,7 @@ public abstract class LivingEntity extends Entity { @@ -117,7 +117,7 @@ index eb777842e158e10e81cae505bebc6601f8dae7ef..3a06f48e9aed59d429ef4142785b3938 } diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 7ff1e7e4d493770bfdbc0ad5e8f10387cefc42d2..b136cdc13d94bc34c998a1986e0c93525356ac5c 100644 +index d7bb93cd6467fe5d1cb1a9b95fa0bc3b31ba9cd2..713a47b38d6054e0b0c50dcdc23ecd3b0077f040 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -342,7 +342,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0512-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0512-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0512-Added-missing-default-perms-for-commands.patch rename to patches/unapplied/server/0512-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0513-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0513-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0513-Add-PlayerShearBlockEvent.patch rename to patches/unapplied/server/0513-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0514-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/unapplied/server/0514-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0515-Limit-recipe-packets.patch b/patches/unapplied/server/0515-Limit-recipe-packets.patch similarity index 96% rename from patches/server/0515-Limit-recipe-packets.patch rename to patches/unapplied/server/0515-Limit-recipe-packets.patch index f5719a6e61..ad8258f498 100644 --- a/patches/server/0515-Limit-recipe-packets.patch +++ b/patches/unapplied/server/0515-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 51ae3c2facb7a1dbdbc47cd681aeb6a6beb4ed72..56e386dcc7239aecc2f86d7c3db1e42c12f430ba 100644 +index 7d7e7d10325eab5e107d43b0bc3e6a7b92653fad..36c791d4dff0d5bf4671e15922795ccd6be4bd01 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -262,6 +262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0516-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0516-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0516-Fix-CraftSound-backwards-compatibility.patch rename to patches/unapplied/server/0516-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0517-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0517-Player-Chunk-Load-Unload-Events.patch similarity index 94% rename from patches/server/0517-Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/server/0517-Player-Chunk-Load-Unload-Events.patch index e040bb583c..5093d677eb 100644 --- a/patches/server/0517-Player-Chunk-Load-Unload-Events.patch +++ b/patches/unapplied/server/0517-Player-Chunk-Load-Unload-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a56dd127776be6de0e88a356b917488f7b20d39c..33f8af6f2e0f3b6f456d2742bebf81f820db4832 100644 +index b91f55082d6828dab010cf409218f70186c6d9cc..5746d80be4174921c0fb3fe1cb8b4e39a74206da 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2164,11 +2164,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0518-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/unapplied/server/0518-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0519-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0519-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0519-Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/server/0519-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/unapplied/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0523-Implement-TargetHitEvent.patch b/patches/unapplied/server/0523-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0523-Implement-TargetHitEvent.patch rename to patches/unapplied/server/0523-Implement-TargetHitEvent.patch diff --git a/patches/server/0524-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0524-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0524-MC-4-Fix-item-position-desync.patch rename to patches/unapplied/server/0524-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0525-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0525-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0525-Additional-Block-Material-API-s.patch rename to patches/unapplied/server/0525-Additional-Block-Material-API-s.patch diff --git a/patches/server/0526-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0526-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0526-Fix-harming-potion-dupe.patch rename to patches/unapplied/server/0526-Fix-harming-potion-dupe.patch diff --git a/patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/unapplied/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0528-Cache-burn-durations.patch b/patches/unapplied/server/0528-Cache-burn-durations.patch similarity index 100% rename from patches/server/0528-Cache-burn-durations.patch rename to patches/unapplied/server/0528-Cache-burn-durations.patch diff --git a/patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/unapplied/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/unapplied/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0532-Fix-interact-event-not-being-called-in-adventure.patch similarity index 95% rename from patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/unapplied/server/0532-Fix-interact-event-not-being-called-in-adventure.patch index cb0bbcceec..cbccf28cf5 100644 --- a/patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/unapplied/server/0532-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 56e386dcc7239aecc2f86d7c3db1e42c12f430ba..ba7c390c523f83a43d62deb1ca69c0552d233c8c 100644 +index 36c791d4dff0d5bf4671e15922795ccd6be4bd01..afd575ff63ed00550de12b02e6b7e8ba140cb3c7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1843,7 +1843,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0533-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0533-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0533-Zombie-API-breaking-doors.patch rename to patches/unapplied/server/0533-Zombie-API-breaking-doors.patch diff --git a/patches/server/0534-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0534-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0534-Fix-nerfed-slime-when-splitting.patch rename to patches/unapplied/server/0534-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0535-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0535-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0535-Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/server/0535-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0536-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0536-Added-WorldGameRuleChangeEvent.patch similarity index 98% rename from patches/server/0536-Added-WorldGameRuleChangeEvent.patch rename to patches/unapplied/server/0536-Added-WorldGameRuleChangeEvent.patch index 5d45d328aa..f6a72cc6bb 100644 --- a/patches/server/0536-Added-WorldGameRuleChangeEvent.patch +++ b/patches/unapplied/server/0536-Added-WorldGameRuleChangeEvent.patch @@ -64,7 +64,7 @@ index 694a2f685cb46a5391da012f4d7e3bd3e6e88f4c..fa8cd4438c19a262272da47985a57f7e public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b3c28849841a0dd661ce81235914670ce6cbbfef..b0935a5ddb0e3b0105fbfb946076248c3bfaccf6 100644 +index cee8c89c5a4d3244f341205e255581086112b708..16c2b99fdc64c228f0e38a7999963093750895b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1808,8 +1808,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0537-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0537-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0537-Added-ServerResourcesReloadedEvent.patch rename to patches/unapplied/server/0537-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/unapplied/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0539-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0539-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0539-Implemented-BlockFailedDispenseEvent.patch rename to patches/unapplied/server/0539-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0540-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0540-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0540-Added-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/server/0540-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0541-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/server/0541-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0542-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0542-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0542-Configurable-door-breaking-difficulty.patch rename to patches/unapplied/server/0542-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0543-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0543-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0543-Empty-commands-shall-not-be-dispatched.patch rename to patches/unapplied/server/0543-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0544-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch rename to patches/unapplied/server/0544-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0545-Remove-stale-POIs.patch b/patches/unapplied/server/0545-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0545-Remove-stale-POIs.patch rename to patches/unapplied/server/0545-Remove-stale-POIs.patch diff --git a/patches/server/0546-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0546-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0546-Fix-villager-boat-exploit.patch rename to patches/unapplied/server/0546-Fix-villager-boat-exploit.patch diff --git a/patches/server/0547-Add-sendOpLevel-API.patch b/patches/unapplied/server/0547-Add-sendOpLevel-API.patch similarity index 95% rename from patches/server/0547-Add-sendOpLevel-API.patch rename to patches/unapplied/server/0547-Add-sendOpLevel-API.patch index d166da4310..1fa0cd7b58 100644 --- a/patches/server/0547-Add-sendOpLevel-API.patch +++ b/patches/unapplied/server/0547-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index ddec145bdcc070a2c82b1bab261939c1ac37a800..8256ca255eb88dd3f0101eaf76225908 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 943cfb59907cb519b2f324a9e9185723ebead60d..69cfbe2c3ba14d7ebf4b29a89161b6d1d00ebc91 100644 +index 96c9cc8c86dbf022c6cbc5c3da130ad6f477d350..1c7c52755a6d71b8fb25cde33573b38f616b8d14 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -653,6 +653,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0548-TODO-Registry-Modification-API.patch b/patches/unapplied/server/0548-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0548-TODO-Registry-Modification-API.patch rename to patches/unapplied/server/0548-TODO-Registry-Modification-API.patch diff --git a/patches/server/0549-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0549-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0549-Add-StructuresLocateEvent.patch rename to patches/unapplied/server/0549-Add-StructuresLocateEvent.patch diff --git a/patches/server/0550-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0550-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0550-Collision-option-for-requiring-a-player-participant.patch rename to patches/unapplied/server/0550-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/unapplied/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0553-Make-schedule-command-per-world.patch b/patches/unapplied/server/0553-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0553-Make-schedule-command-per-world.patch rename to patches/unapplied/server/0553-Make-schedule-command-per-world.patch diff --git a/patches/server/0554-Configurable-max-leash-distance.patch b/patches/unapplied/server/0554-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0554-Configurable-max-leash-distance.patch rename to patches/unapplied/server/0554-Configurable-max-leash-distance.patch diff --git a/patches/server/0555-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0555-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0555-Implement-BlockPreDispenseEvent.patch rename to patches/unapplied/server/0555-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/unapplied/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/unapplied/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0560-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0560-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0560-Reset-shield-blocking-on-dimension-change.patch rename to patches/unapplied/server/0560-Reset-shield-blocking-on-dimension-change.patch index ac11e8ba6f..41ee730fa2 100644 --- a/patches/server/0560-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/unapplied/server/0560-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 33f8af6f2e0f3b6f456d2742bebf81f820db4832..b04c39543ea3cddf479807f93734ab727f320de4 100644 +index 5746d80be4174921c0fb3fe1cb8b4e39a74206da..8edabceba88b36479ff74b0d1eb6fdf48743506a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1186,6 +1186,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0561-add-DragonEggFormEvent.patch b/patches/unapplied/server/0561-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0561-add-DragonEggFormEvent.patch rename to patches/unapplied/server/0561-add-DragonEggFormEvent.patch diff --git a/patches/server/0562-EntityMoveEvent.patch b/patches/unapplied/server/0562-EntityMoveEvent.patch similarity index 95% rename from patches/server/0562-EntityMoveEvent.patch rename to patches/unapplied/server/0562-EntityMoveEvent.patch index 48f1ff6234..2131889ff6 100644 --- a/patches/server/0562-EntityMoveEvent.patch +++ b/patches/unapplied/server/0562-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index 04137173ca7034b9dff37a68518e8b6fb0330188..cd9022186351fa398bb8ab590ee8108b this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f8832ebb35ceb7f70e12d6c11f435308de4ae33d..abc909031b676c91b621a2c9a8beb0b1a76e3cdc 100644 +index e6f931b8443a539441d9f918909e8244c853e43e..9945e53fdcbc057623ed35ec1dd3d6181017bf32 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -219,6 +219,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -29,7 +29,7 @@ index f8832ebb35ceb7f70e12d6c11f435308de4ae33d..abc909031b676c91b621a2c9a8beb0b1 final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date()); io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index beaf3b3bf4a4373d563b5b75238f79299a304db5..d388ea52c711eb26c99f82ffe72c0b5b245d30d1 100644 +index 128b4ce85bc8f79a1291d087fdb24e5a083f9464..82da840ed901d922665feff643ef2e364f3fa353 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3327,6 +3327,20 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 91% rename from patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/unapplied/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch index b35b6475c0..85f6a1add3 100644 --- a/patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/unapplied/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index abc909031b676c91b621a2c9a8beb0b1a76e3cdc..b9208d28c3bfb40679fb15546b47628b879e4e7d 100644 +index 9945e53fdcbc057623ed35ec1dd3d6181017bf32..3d4eff26f6530d11821ba09953095036bce3a2d3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1512,6 +1512,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0564-Inline-shift-direction-fields.patch b/patches/unapplied/server/0564-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0564-Inline-shift-direction-fields.patch rename to patches/unapplied/server/0564-Inline-shift-direction-fields.patch diff --git a/patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0567-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0567-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0567-living-entity-allow-attribute-registration.patch rename to patches/unapplied/server/0567-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0568-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0568-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0568-fix-dead-slime-setSize-invincibility.patch rename to patches/unapplied/server/0568-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/unapplied/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0570-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0570-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0570-Add-support-for-hex-color-codes-in-console.patch rename to patches/unapplied/server/0570-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0571-Expose-Tracked-Players.patch b/patches/unapplied/server/0571-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0571-Expose-Tracked-Players.patch rename to patches/unapplied/server/0571-Expose-Tracked-Players.patch diff --git a/patches/server/0572-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0572-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0572-Remove-streams-from-SensorNearest.patch rename to patches/unapplied/server/0572-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/unapplied/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0574-Improve-ServerGUI.patch b/patches/unapplied/server/0574-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0574-Improve-ServerGUI.patch rename to patches/unapplied/server/0574-Improve-ServerGUI.patch diff --git a/patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/unapplied/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0576-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0576-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0576-fix-converting-txt-to-json-file.patch rename to patches/unapplied/server/0576-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0577-Add-worldborder-events.patch b/patches/unapplied/server/0577-Add-worldborder-events.patch similarity index 100% rename from patches/server/0577-Add-worldborder-events.patch rename to patches/unapplied/server/0577-Add-worldborder-events.patch diff --git a/patches/server/0578-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0578-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0578-added-PlayerNameEntityEvent.patch rename to patches/unapplied/server/0578-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0579-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0579-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0579-Prevent-grindstones-from-overstacking-items.patch rename to patches/unapplied/server/0579-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0580-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0580-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0580-Add-recipe-to-cook-events.patch rename to patches/unapplied/server/0580-Add-recipe-to-cook-events.patch diff --git a/patches/server/0581-Add-Block-isValidTool.patch b/patches/unapplied/server/0581-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0581-Add-Block-isValidTool.patch rename to patches/unapplied/server/0581-Add-Block-isValidTool.patch diff --git a/patches/server/0582-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0582-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0582-Allow-using-signs-inside-spawn-protection.patch rename to patches/unapplied/server/0582-Allow-using-signs-inside-spawn-protection.patch index c9ebb6780f..5382a3250e 100644 --- a/patches/server/0582-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/unapplied/server/0582-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ba7c390c523f83a43d62deb1ca69c0552d233c8c..5e87d8080da346f82431fcff34416773e0844fcf 100644 +index afd575ff63ed00550de12b02e6b7e8ba140cb3c7..dd8bbf54f2b58d4e0ab7769640c1f76cdda55804 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1835,7 +1835,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0583-Expand-world-key-API.patch b/patches/unapplied/server/0583-Expand-world-key-API.patch similarity index 100% rename from patches/server/0583-Expand-world-key-API.patch rename to patches/unapplied/server/0583-Expand-world-key-API.patch diff --git a/patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0584-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/unapplied/server/0584-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0585-Item-Rarity-API.patch b/patches/unapplied/server/0585-Item-Rarity-API.patch similarity index 100% rename from patches/server/0585-Item-Rarity-API.patch rename to patches/unapplied/server/0585-Item-Rarity-API.patch diff --git a/patches/server/0586-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0586-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0586-copy-TESign-isEditable-from-snapshots.patch rename to patches/unapplied/server/0586-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0587-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch rename to patches/unapplied/server/0587-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0588-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0588-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0588-forced-whitelist-use-configurable-kick-message.patch rename to patches/unapplied/server/0588-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/unapplied/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch index e5bd1a4a2b..d80567a146 100644 --- a/patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/unapplied/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5e87d8080da346f82431fcff34416773e0844fcf..af5fe9d98db344113410689a5d0c9e4bffc589dc 100644 +index dd8bbf54f2b58d4e0ab7769640c1f76cdda55804..54ecd6cc439fcd2e2dfd6c46abff5cbae3ff47d3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1282,7 +1282,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0590-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0590-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0590-Entity-load-save-limit-per-chunk.patch rename to patches/unapplied/server/0590-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0591-Expose-protocol-version.patch b/patches/unapplied/server/0591-Expose-protocol-version.patch similarity index 100% rename from patches/server/0591-Expose-protocol-version.patch rename to patches/unapplied/server/0591-Expose-protocol-version.patch diff --git a/patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/unapplied/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 92% rename from patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/unapplied/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index 5ad3879177..e2ccb8cbdd 100644 --- a/patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/unapplied/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,7 +9,7 @@ till their item is switched. This patch clears the active item when the event is cancelled diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d388ea52c711eb26c99f82ffe72c0b5b245d30d1..b58dba64638a7cabd05487a1f6fa7553321e3196 100644 +index 82da840ed901d922665feff643ef2e364f3fa353..a13b2e6bee2172f2d9d6807e3f614cb8229c2e9d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3814,6 +3814,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0594-Add-bypass-host-check.patch b/patches/unapplied/server/0594-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0594-Add-bypass-host-check.patch rename to patches/unapplied/server/0594-Add-bypass-host-check.patch diff --git a/patches/server/0595-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0595-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0595-Set-area-affect-cloud-rotation.patch rename to patches/unapplied/server/0595-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0596-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/server/0596-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0599-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch rename to patches/unapplied/server/0599-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/unapplied/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch index d19bb1f54d..53733cbd46 100644 --- a/patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/unapplied/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index af5fe9d98db344113410689a5d0c9e4bffc589dc..908bf489f064780e6751de2762cb94668ae16d7e 100644 +index 54ecd6cc439fcd2e2dfd6c46abff5cbae3ff47d3..c18d4fdf867f5465e877cfbd74c3325acef8ec2f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2047,6 +2047,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0601-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0601-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0601-Added-PlayerDeepSleepEvent.patch rename to patches/unapplied/server/0601-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0602-More-World-API.patch b/patches/unapplied/server/0602-More-World-API.patch similarity index 97% rename from patches/server/0602-More-World-API.patch rename to patches/unapplied/server/0602-More-World-API.patch index 10973dc80b..8a58040e46 100644 --- a/patches/server/0602-More-World-API.patch +++ b/patches/unapplied/server/0602-More-World-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More World API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b0935a5ddb0e3b0105fbfb946076248c3bfaccf6..066130e1651d05018e4e73e5b9879187e80e01e4 100644 +index 16c2b99fdc64c228f0e38a7999963093750895b9..a767f0f8f7cbe24c4cb8deaffa747ff74371a3cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2050,6 +2050,69 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0603-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0603-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0603-Added-PlayerBedFailEnterEvent.patch rename to patches/unapplied/server/0603-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0604-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/unapplied/server/0604-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/unapplied/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0606-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0606-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0606-Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/server/0606-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/unapplied/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch index e7a6ce918a..b6235c3405 100644 --- a/patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/unapplied/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 908bf489f064780e6751de2762cb94668ae16d7e..7794964b08ac64e87fe83ebf7d7d483316172246 100644 +index c18d4fdf867f5465e877cfbd74c3325acef8ec2f..98ff222a1a48b0f12e4ae01c744944ac8a1a8489 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2764,7 +2764,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0608-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0608-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0608-Add-Channel-initialization-listeners.patch rename to patches/unapplied/server/0608-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/unapplied/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0610-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0610-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0610-Add-more-WanderingTrader-API.patch rename to patches/unapplied/server/0610-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0611-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0611-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0611-Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/server/0611-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0614-Inventory-close.patch b/patches/unapplied/server/0614-Inventory-close.patch similarity index 100% rename from patches/server/0614-Inventory-close.patch rename to patches/unapplied/server/0614-Inventory-close.patch diff --git a/patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0616-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0616-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0616-Fix-CraftPotionBrewer-cache.patch rename to patches/unapplied/server/0616-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0617-Add-basic-Datapack-API.patch b/patches/unapplied/server/0617-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0617-Add-basic-Datapack-API.patch rename to patches/unapplied/server/0617-Add-basic-Datapack-API.patch diff --git a/patches/server/0618-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0618-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0618-Add-environment-variable-to-disable-server-gui.patch rename to patches/unapplied/server/0618-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0619-additions-to-PlayerGameModeChangeEvent.patch similarity index 97% rename from patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch rename to patches/unapplied/server/0619-additions-to-PlayerGameModeChangeEvent.patch index 05594f8fa2..e9cffeada8 100644 --- a/patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/unapplied/server/0619-additions-to-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index d47f3d255eddd652fedb4aa55286b756fe962995..27c0aaf123c3e945eb24e8a3892bd8ac } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b04c39543ea3cddf479807f93734ab727f320de4..1669d91153cef50f45f61b7cb2351ac854cb035b 100644 +index 8edabceba88b36479ff74b0d1eb6fdf48743506a..b9516dc15086394d7029262ec37842dbf5d3bb7e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1826,8 +1826,15 @@ public class ServerPlayer extends Player { @@ -129,7 +129,7 @@ index 645a226c2e3f6dcf1c25187d006d425038b4545d..17c313b9cb45c8158cab751ffc4e0dc3 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1468125664acb4594e0fe12e3b74b5b7610eceeb..a4e92b8b0a6192c3f805591eaef09da40864fb8d 100644 +index 98ff222a1a48b0f12e4ae01c744944ac8a1a8489..b22ef0065eff4087cc9e991c5ce910bafd2d5e6a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2773,7 +2773,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -142,7 +142,7 @@ index 1468125664acb4594e0fe12e3b74b5b7610eceeb..a4e92b8b0a6192c3f805591eaef09da4 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c221a8543da2e3c8fafa77fc63db7e1de222f0c9..ceb277b8c69de3ffef29784494b16d1c364707c4 100644 +index 1c7c52755a6d71b8fb25cde33573b38f616b8d14..13c3f7d01df3706637b022f5f42bcc269e5670db 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1495,7 +1495,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0620-ItemStack-repair-check-API.patch b/patches/unapplied/server/0620-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0620-ItemStack-repair-check-API.patch rename to patches/unapplied/server/0620-ItemStack-repair-check-API.patch diff --git a/patches/server/0621-More-Enchantment-API.patch b/patches/unapplied/server/0621-More-Enchantment-API.patch similarity index 100% rename from patches/server/0621-More-Enchantment-API.patch rename to patches/unapplied/server/0621-More-Enchantment-API.patch diff --git a/patches/server/0622-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0622-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0622-Move-range-check-for-block-placing-up.patch rename to patches/unapplied/server/0622-Move-range-check-for-block-placing-up.patch index b76eccb5f3..d96040b8ce 100644 --- a/patches/server/0622-Move-range-check-for-block-placing-up.patch +++ b/patches/unapplied/server/0622-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b069d3b3f68adbde23f69407a8803c13d15f7d9e..9a2d9bcad94612e5c2506db5a9dcd4a3f9271a59 100644 +index b22ef0065eff4087cc9e991c5ce910bafd2d5e6a..03d4c135928836d33a2ff7dc1b469042fd364eb7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1821,6 +1821,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0623-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0623-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0623-Fix-and-optimise-world-force-upgrading.patch rename to patches/unapplied/server/0623-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0624-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0624-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0624-Add-Mob-lookAt-API.patch rename to patches/unapplied/server/0624-Add-Mob-lookAt-API.patch diff --git a/patches/server/0625-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0625-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0625-Add-Unix-domain-socket-support.patch rename to patches/unapplied/server/0625-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0626-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0626-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0626-Add-EntityInsideBlockEvent.patch rename to patches/unapplied/server/0626-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0627-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0627-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0627-Attributes-API-for-item-defaults.patch rename to patches/unapplied/server/0627-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 97% rename from patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch index 9ac0554d81..0888164d99 100644 --- a/patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/unapplied/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b9208d28c3bfb40679fb15546b47628b879e4e7d..a2966939613594d5a6fcc3ef1f1d6f398c4c0523 100644 +index 3d4eff26f6530d11821ba09953095036bce3a2d3..abc3041f363287f0596b05004b0d4c5408c8820e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -531,8 +531,8 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -95,7 +95,7 @@ index 274c8eb1f76fb7cb8a16b438e7e1b14804f3dc51..b6218626bad7f8ddfba91b216ac1e106 if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 066130e1651d05018e4e73e5b9879187e80e01e4..945a8f61eec02043008e31e3fe64a66f76ba715a 100644 +index a767f0f8f7cbe24c4cb8deaffa747ff74371a3cd..4c900c17f9080cdb8d910f6dbc8503b0a691df3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1183,7 +1183,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0629-More-Lidded-Block-API.patch b/patches/unapplied/server/0629-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0629-More-Lidded-Block-API.patch rename to patches/unapplied/server/0629-More-Lidded-Block-API.patch diff --git a/patches/server/0630-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0630-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0630-Limit-item-frame-cursors-on-maps.patch rename to patches/unapplied/server/0630-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0631-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0631-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0631-Add-PlayerKickEvent-causes.patch rename to patches/unapplied/server/0631-Add-PlayerKickEvent-causes.patch index 515c581a4f..cbb0b7363e 100644 --- a/patches/server/0631-Add-PlayerKickEvent-causes.patch +++ b/patches/unapplied/server/0631-Add-PlayerKickEvent-causes.patch @@ -88,7 +88,7 @@ index 65637a33ba171a4b598f70cd943d24b0ee44a69f..57a9146bf2dee7a60aab16716e25348f } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8590a016c5d48fbde1160440f2d5f68b13e2a254..dd6b27f1759737cf1e0fcfd08a91e670a9f38692 100644 +index 03d4c135928836d33a2ff7dc1b469042fd364eb7..a62d13d0f345989a2d8c95fe701c4625b856495f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -358,7 +358,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -491,7 +491,7 @@ index a24e7a66d52eddbdad8db71cf5e45f1a458c389f..e1c13ac7b11fb0080435fc34502208c8 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4315db62aa597de5fa2a022513ada129ae19a3f8..99753168f6611b9844c43766f2e54a9e721cfdbc 100644 +index 13c3f7d01df3706637b022f5f42bcc269e5670db..656f03f23af7e7c731b5f8b4404cabc153a0dd83 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -599,7 +599,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0632-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0632-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0632-Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/server/0632-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/unapplied/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/unapplied/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0635-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch rename to patches/unapplied/server/0635-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0636-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0636-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0636-Add-BellRevealRaiderEvent.patch rename to patches/unapplied/server/0636-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0637-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0637-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0637-Fix-invulnerable-end-crystals.patch rename to patches/unapplied/server/0637-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0638-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0638-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0638-Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/server/0638-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0639-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0639-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0639-Fix-dangerous-end-portal-logic.patch rename to patches/unapplied/server/0639-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/unapplied/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0641-Make-item-validations-configurable.patch b/patches/unapplied/server/0641-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0641-Make-item-validations-configurable.patch rename to patches/unapplied/server/0641-Make-item-validations-configurable.patch diff --git a/patches/server/0642-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0642-Line-Of-Sight-Changes.patch similarity index 98% rename from patches/server/0642-Line-Of-Sight-Changes.patch rename to patches/unapplied/server/0642-Line-Of-Sight-Changes.patch index d8323f1562..8b7d7656e8 100644 --- a/patches/server/0642-Line-Of-Sight-Changes.patch +++ b/patches/unapplied/server/0642-Line-Of-Sight-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b58dba64638a7cabd05487a1f6fa7553321e3196..fa80feabfc54857781062a0debeb866f3d50bfc0 100644 +index a13b2e6bee2172f2d9d6807e3f614cb8229c2e9d..08470f2b9d89db510375bed0c53907850e9199f7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3542,7 +3542,8 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0643-add-per-world-spawn-limits.patch b/patches/unapplied/server/0643-add-per-world-spawn-limits.patch similarity index 91% rename from patches/server/0643-add-per-world-spawn-limits.patch rename to patches/unapplied/server/0643-add-per-world-spawn-limits.patch index daa9b82035..3b089ece30 100644 --- a/patches/server/0643-add-per-world-spawn-limits.patch +++ b/patches/unapplied/server/0643-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 945a8f61eec02043008e31e3fe64a66f76ba715a..6b7e77c35ae737551859e9e7515cd5c189ec7313 100644 +index 4c900c17f9080cdb8d910f6dbc8503b0a691df3e..5d7794e995f83de5b0134474f08f8f92f3d53303 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -209,6 +209,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0644-Fix-potions-splash-events.patch b/patches/unapplied/server/0644-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0644-Fix-potions-splash-events.patch rename to patches/unapplied/server/0644-Fix-potions-splash-events.patch diff --git a/patches/server/0645-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0645-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0645-Add-more-LimitedRegion-API.patch rename to patches/unapplied/server/0645-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 94% rename from patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/unapplied/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch index 710fdd8048..ed80e027c4 100644 --- a/patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/unapplied/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1669d91153cef50f45f61b7cb2351ac854cb035b..26f4f00bb3d58255c030137fa7a8c187942aaacb 100644 +index b9516dc15086394d7029262ec37842dbf5d3bb7e..6063ef01194d27991720f10ea78057019517bddc 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2225,7 +2225,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0647-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0647-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0647-Missing-Entity-Behavior-API.patch rename to patches/unapplied/server/0647-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/unapplied/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch index ce4da42a74..5e0c8ceeab 100644 --- a/patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/unapplied/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6c166950247118cb1bbae4aa1fc3ee8a6790ab1b..d620f1358e0a75ccdfd9bed98b95af47b337748d 100644 +index a62d13d0f345989a2d8c95fe701c4625b856495f..808e506f703cf88787cf0226cb517eccf60ee9c6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1201,7 +1201,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/unapplied/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 97% rename from patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch index a23fb6ef06..c3af70c713 100644 --- a/patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/unapplied/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a2966939613594d5a6fcc3ef1f1d6f398c4c0523..17e77f727b0cd3da788bf5593762f2930e98a609 100644 +index abc3041f363287f0596b05004b0d4c5408c8820e..dd310cd70d74a16b658ffdc7e9b595745a3b7e6c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -227,7 +227,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0651-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/unapplied/server/0651-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0652-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0652-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0652-Adds-PlayerArmSwingEvent.patch rename to patches/unapplied/server/0652-Adds-PlayerArmSwingEvent.patch index 33ab167db8..7b2b0c53c0 100644 --- a/patches/server/0652-Adds-PlayerArmSwingEvent.patch +++ b/patches/unapplied/server/0652-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d620f1358e0a75ccdfd9bed98b95af47b337748d..49c45be8d757ee11a18ce507c6397835e3911e86 100644 +index 808e506f703cf88787cf0226cb517eccf60ee9c6..a09707ce19efcd00c6842d9c614e411c50b0755b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2490,7 +2490,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 96% rename from patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/unapplied/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch index bb9352a02b..16e9b33cda 100644 --- a/patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/unapplied/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 26f4f00bb3d58255c030137fa7a8c187942aaacb..c40028d82908a9dc939b6304d06b6cb7d2376b31 100644 +index 6063ef01194d27991720f10ea78057019517bddc..cbce8344daca622a729dcb959283fe60dd292b08 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -262,7 +262,6 @@ public class ServerPlayer extends Player { @@ -17,7 +17,7 @@ index 26f4f00bb3d58255c030137fa7a8c187942aaacb..c40028d82908a9dc939b6304d06b6cb7 public boolean isRealPlayer; // Paper public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 49c45be8d757ee11a18ce507c6397835e3911e86..470b32ce81f5303c6d6d972e79f53cd82e9669a5 100644 +index a09707ce19efcd00c6842d9c614e411c50b0755b..29672a9f7395023789d2e1605447f1302e722c02 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -510,7 +510,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0654-Add-config-for-mobs-immune-to-default-effects.patch similarity index 97% rename from patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/unapplied/server/0654-Add-config-for-mobs-immune-to-default-effects.patch index 6719d108a0..acb7b5c795 100644 --- a/patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/unapplied/server/0654-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index fa80feabfc54857781062a0debeb866f3d50bfc0..e775468f225aa4123e3f679c11d4e7896f061730 100644 +index 08470f2b9d89db510375bed0c53907850e9199f7..7aedcb9e29873f5360b24cbcc3d87c0da581b2e5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1152,7 +1152,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0655-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0655-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0655-Fix-incorrect-message-for-outdated-client.patch rename to patches/unapplied/server/0655-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0656-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0656-Don-t-apply-cramming-damage-to-players.patch similarity index 93% rename from patches/server/0656-Don-t-apply-cramming-damage-to-players.patch rename to patches/unapplied/server/0656-Don-t-apply-cramming-damage-to-players.patch index 5c01265067..ba1d00fa0a 100644 --- a/patches/server/0656-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/unapplied/server/0656-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c40028d82908a9dc939b6304d06b6cb7d2376b31..715a719d58f3333d8c3ce761182d4932e5b08e6c 100644 +index cbce8344daca622a729dcb959283fe60dd292b08..369a505fcde90cbc7777780576451cac436aa5b8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1453,7 +1453,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/unapplied/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/unapplied/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0659-Stinger-API.patch b/patches/unapplied/server/0659-Stinger-API.patch similarity index 100% rename from patches/server/0659-Stinger-API.patch rename to patches/unapplied/server/0659-Stinger-API.patch diff --git a/patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/unapplied/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0661-Add-System.out-err-catcher.patch b/patches/unapplied/server/0661-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0661-Add-System.out-err-catcher.patch rename to patches/unapplied/server/0661-Add-System.out-err-catcher.patch diff --git a/patches/server/0662-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0662-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0662-Fix-test-not-bootstrapping.patch rename to patches/unapplied/server/0662-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0664-Improve-boat-collision-performance.patch b/patches/unapplied/server/0664-Improve-boat-collision-performance.patch similarity index 97% rename from patches/server/0664-Improve-boat-collision-performance.patch rename to patches/unapplied/server/0664-Improve-boat-collision-performance.patch index ac89107a80..afa4c9430f 100644 --- a/patches/server/0664-Improve-boat-collision-performance.patch +++ b/patches/unapplied/server/0664-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 8120739e2a7c4c86ecb7058f08bd8179d3a943b8..439ae035d8b2787916e017e2636115b5 }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e775468f225aa4123e3f679c11d4e7896f061730..865d774135f8417142287cc9efd8ca5ec909a04a 100644 +index 7aedcb9e29873f5360b24cbcc3d87c0da581b2e5..b7cc5fb5798d703124e08afc850c24afb2d6ee69 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1340,7 +1340,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/unapplied/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch index 2d96e2a69b..35c2130614 100644 --- a/patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/unapplied/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 470b32ce81f5303c6d6d972e79f53cd82e9669a5..15605b81993be6a88ee85fc3a9efaf3fa1669797 100644 +index 29672a9f7395023789d2e1605447f1302e722c02..ffd7d7e916a8217e4929f77c0252a6f4e3416cef 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -427,7 +427,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/unapplied/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0667-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0667-Add-PlayerSetSpawnEvent.patch similarity index 98% rename from patches/server/0667-Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/0667-Add-PlayerSetSpawnEvent.patch index cd968f756d..2a67d88071 100644 --- a/patches/server/0667-Add-PlayerSetSpawnEvent.patch +++ b/patches/unapplied/server/0667-Add-PlayerSetSpawnEvent.patch @@ -32,7 +32,7 @@ index ce1c7512cc368e196ae94ee22c6a228c975b4980..1e41de9523c5fa3b9cfced798a5c35a2 String string = resourceKey.location().toString(); if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 715a719d58f3333d8c3ce761182d4932e5b08e6c..8f6ec40f9aebececd4506ce29d33f44a5eab43b7 100644 +index 369a505fcde90cbc7777780576451cac436aa5b8..c0d24d9f72445e5396723749f36cf91693311a45 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1294,7 +1294,7 @@ public class ServerPlayer extends Player { @@ -129,7 +129,7 @@ index 37e111589134d80fdfd7a04d624b8c1d58a2d664..53b35f003034e7f4c9dd8ccfaf773891 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a345baf095ee766092e5b09e50a2c7d60965d995..ba0231ef9d0cc1c0e67b90457e08f0386daf4f42 100644 +index 656f03f23af7e7c731b5f8b4404cabc153a0dd83..dda1f3e9370110c08ed28fd404c8a246fa468db9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1315,9 +1315,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/unapplied/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0669-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0669-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0669-Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/0669-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0670-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0670-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0670-Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/0670-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0671-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0671-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0671-Added-EntityDamageItemEvent.patch rename to patches/unapplied/server/0671-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0672-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0672-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0672-Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/0672-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/unapplied/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/unapplied/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0674-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/unapplied/server/0674-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0675-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0675-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0675-Make-EntityUnleashEvent-cancellable.patch rename to patches/unapplied/server/0675-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0676-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0676-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0676-Clear-bucket-NBT-after-dispense.patch rename to patches/unapplied/server/0676-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0677-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/server/0677-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0678-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0678-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0678-Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/0678-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0680-More-CommandBlock-API.patch b/patches/unapplied/server/0680-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0680-More-CommandBlock-API.patch rename to patches/unapplied/server/0680-More-CommandBlock-API.patch diff --git a/patches/server/0681-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0681-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0681-Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/0681-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0682-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0682-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0682-Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/0682-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 93% rename from patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch index f48066d564..77a31340d9 100644 --- a/patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/unapplied/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 17e77f727b0cd3da788bf5593762f2930e98a609..2de60a2f3da7f8d30295def7045cd7535f84e37f 100644 +index dd310cd70d74a16b658ffdc7e9b595745a3b7e6c..d876de5bf781ceb3a8e89bca62019baf1e5a9710 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -834,6 +834,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -31,7 +31,7 @@ index 17e77f727b0cd3da788bf5593762f2930e98a609..2de60a2f3da7f8d30295def7045cd753 blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6b7e77c35ae737551859e9e7515cd5c189ec7313..17351379ddea082c7b6792b21220eb086d9d1906 100644 +index 5d7794e995f83de5b0134474f08f8f92f3d53303..7392ae299c4d09944552249bc1dc90b611fdb964 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -685,6 +685,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0684-Get-entity-default-attributes.patch b/patches/unapplied/server/0684-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0684-Get-entity-default-attributes.patch rename to patches/unapplied/server/0684-Get-entity-default-attributes.patch diff --git a/patches/server/0685-Left-handed-API.patch b/patches/unapplied/server/0685-Left-handed-API.patch similarity index 100% rename from patches/server/0685-Left-handed-API.patch rename to patches/unapplied/server/0685-Left-handed-API.patch diff --git a/patches/server/0686-Add-more-advancement-API.patch b/patches/unapplied/server/0686-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0686-Add-more-advancement-API.patch rename to patches/unapplied/server/0686-Add-more-advancement-API.patch diff --git a/patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0687-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/0687-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0688-Add-critical-damage-API.patch b/patches/unapplied/server/0688-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0688-Add-critical-damage-API.patch rename to patches/unapplied/server/0688-Add-critical-damage-API.patch diff --git a/patches/server/0689-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0689-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0689-Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/0689-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0690-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0690-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0690-Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/server/0690-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0691-Goat-ram-API.patch b/patches/unapplied/server/0691-Goat-ram-API.patch similarity index 100% rename from patches/server/0691-Goat-ram-API.patch rename to patches/unapplied/server/0691-Goat-ram-API.patch diff --git a/patches/server/0692-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0692-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0692-Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/server/0692-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0693-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/0693-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0694-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0694-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0694-Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/0694-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 95% rename from patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/unapplied/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index a9ccad85a7..6ba3a7766b 100644 --- a/patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/unapplied/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/ state desync POV because the TE is getting unloaded anyways. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2de60a2f3da7f8d30295def7045cd7535f84e37f..d984a4304e8ebbcc3147e34bd3e35a7f0f95a83b 100644 +index d876de5bf781ceb3a8e89bca62019baf1e5a9710..5ec15aa3005e7cc401b9f391423008e1b75fe73f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1413,9 +1413,13 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -28,7 +28,7 @@ index 2de60a2f3da7f8d30295def7045cd7535f84e37f..d984a4304e8ebbcc3147e34bd3e35a7f } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8f6ec40f9aebececd4506ce29d33f44a5eab43b7..93fc24962062acf1425a475f8781b6d8827a5af8 100644 +index c0d24d9f72445e5396723749f36cf91693311a45..76ab004580f48fefdeec03b727f1589963c4684a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1595,6 +1595,18 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0696-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0696-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0696-Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/0696-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0697-Log-when-the-async-catcher-is-tripped.patch b/patches/unapplied/server/0697-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0697-Log-when-the-async-catcher-is-tripped.patch rename to patches/unapplied/server/0697-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch index 55f32e2070..b17044af88 100644 --- a/patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/unapplied/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -302,7 +302,7 @@ index 049861abd721a964c965177719fe5bc2d04214a0..a6e5333c6e339a3a1853a6023a2e68c0 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 17351379ddea082c7b6792b21220eb086d9d1906..c8e798cb13ffc1800fb04cdf0516a1f787f1da56 100644 +index 7392ae299c4d09944552249bc1dc90b611fdb964..778d7503af4ab00e217c12b314c8ca4ccceae411 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1700,9 +1700,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0699-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0699-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0699-Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/0699-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0700-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0700-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0700-Allow-controlled-flushing-for-network-manager.patch rename to patches/unapplied/server/0700-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0701-Optimise-general-POI-access.patch b/patches/unapplied/server/0701-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0701-Optimise-general-POI-access.patch rename to patches/unapplied/server/0701-Optimise-general-POI-access.patch diff --git a/patches/server/0702-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0702-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0702-Optimise-chunk-tick-iteration.patch rename to patches/unapplied/server/0702-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0703-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0703-Execute-chunk-tasks-mid-tick.patch similarity index 98% rename from patches/server/0703-Execute-chunk-tasks-mid-tick.patch rename to patches/unapplied/server/0703-Execute-chunk-tasks-mid-tick.patch index 3701b69afc..4f7d2028f3 100644 --- a/patches/server/0703-Execute-chunk-tasks-mid-tick.patch +++ b/patches/unapplied/server/0703-Execute-chunk-tasks-mid-tick.patch @@ -126,7 +126,7 @@ index b768767b92bf7691a6e57627c69818a1f5fd82c8..ebd0da4f87c74f12d702e1ae4f320688 } // Paper start - optimise chunk tick iteration diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index d984a4304e8ebbcc3147e34bd3e35a7f0f95a83b..ef6aabd65651fe2eabe319908e6adfe9f97ee467 100644 +index 5ec15aa3005e7cc401b9f391423008e1b75fe73f..9b2c24a01fd09d9520f3c8baff7c56ae48f0c5de 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -214,6 +214,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/unapplied/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/unapplied/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0706-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0706-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/0706-Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/server/0706-Detail-more-information-in-watchdog-dumps.patch index 458d99daec..7cc39ccd04 100644 --- a/patches/server/0706-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/unapplied/server/0706-Detail-more-information-in-watchdog-dumps.patch @@ -76,7 +76,7 @@ index acfa1907bfc9c29d261cfccc00d65bad9ad1a002..d6f3869f5725c7f081efb7f486f74dbb }); throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ef6aabd65651fe2eabe319908e6adfe9f97ee467..380733b27c4e091c9376b779701e8e39d1c1ac0e 100644 +index 9b2c24a01fd09d9520f3c8baff7c56ae48f0c5de..7c6b76399648d67e6726a13e1d29e1978bae641a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1060,7 +1060,26 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0707-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0707-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0707-Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/0707-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0708-Distance-manager-tick-timings.patch b/patches/unapplied/server/0708-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0708-Distance-manager-tick-timings.patch rename to patches/unapplied/server/0708-Distance-manager-tick-timings.patch diff --git a/patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/unapplied/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/unapplied/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0711-Add-packet-limiter-config.patch b/patches/unapplied/server/0711-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0711-Add-packet-limiter-config.patch rename to patches/unapplied/server/0711-Add-packet-limiter-config.patch diff --git a/patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/unapplied/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/unapplied/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/unapplied/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0715-Time-scoreboard-search.patch b/patches/unapplied/server/0715-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0715-Time-scoreboard-search.patch rename to patches/unapplied/server/0715-Time-scoreboard-search.patch diff --git a/patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/unapplied/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0717-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/unapplied/server/0717-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0718-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0718-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0718-Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/0718-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0720-Optimise-random-block-ticking.patch b/patches/unapplied/server/0720-Optimise-random-block-ticking.patch similarity index 99% rename from patches/server/0720-Optimise-random-block-ticking.patch rename to patches/unapplied/server/0720-Optimise-random-block-ticking.patch index 0dca66812b..94f9324cb7 100644 --- a/patches/server/0720-Optimise-random-block-ticking.patch +++ b/patches/unapplied/server/0720-Optimise-random-block-ticking.patch @@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 380733b27c4e091c9376b779701e8e39d1c1ac0e..81a82ab392dba78ff20bb86140986f6bf72c8a77 100644 +index 7c6b76399648d67e6726a13e1d29e1978bae641a..915dd3221124756fb94d60624cd552b1ab586ab5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -704,6 +704,10 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0721-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0721-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0721-Optimise-non-flush-packet-sending.patch rename to patches/unapplied/server/0721-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0722-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0722-Optimise-nearby-player-lookups.patch similarity index 99% rename from patches/server/0722-Optimise-nearby-player-lookups.patch rename to patches/unapplied/server/0722-Optimise-nearby-player-lookups.patch index 80c4cdb9cb..f4ee96c8b0 100644 --- a/patches/server/0722-Optimise-nearby-player-lookups.patch +++ b/patches/unapplied/server/0722-Optimise-nearby-player-lookups.patch @@ -104,7 +104,7 @@ index 57e13cb9d1460be34fe06f7c7e14330f60f0a51a..7f68b05b4d0789c308b5f90a5d626a63 protected ChunkGenerator generator() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 81a82ab392dba78ff20bb86140986f6bf72c8a77..c8e0531dccd7cff093c304b25c62476dbcb10ff9 100644 +index 915dd3221124756fb94d60624cd552b1ab586ab5..5570ff6fccda19343a5520dca2671045c4fc48b4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -444,6 +444,84 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0723-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0723-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0723-Remove-streams-for-villager-AI.patch rename to patches/unapplied/server/0723-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0724-Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch rename to patches/unapplied/server/0724-Use-Velocity-compression-and-cipher-natives.patch index f09da1fe99..3ca127647d 100644 --- a/patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/unapplied/server/0724-Use-Velocity-compression-and-cipher-natives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives diff --git a/build.gradle.kts b/build.gradle.kts -index 0f4162f47cea792696271b7157c95c399d2c3567..3c493f7eeffefee013c7837c3b46531fd20aac0f 100644 +index dbaff3f2505f09e87bea314bb179a408eebd2e7c..dc61ebe468740b0b9359bf6e3a6050726136941c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,6 +28,11 @@ dependencies { diff --git a/patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/unapplied/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch b/patches/unapplied/server/0726-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch rename to patches/unapplied/server/0726-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/unapplied/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/unapplied/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0729-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/0729-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index ad22b266f9..7771fdeb16 100644 --- a/patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/unapplied/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 15605b81993be6a88ee85fc3a9efaf3fa1669797..411b555415f90504adadddc67387276ba340f360 100644 +index ffd7d7e916a8217e4929f77c0252a6f4e3416cef..d9a44cc361b1e4a307d91e12a90986a2bbca550d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -835,6 +835,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/unapplied/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0732-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0732-Ensure-valid-vehicle-status.patch similarity index 90% rename from patches/server/0732-Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/0732-Ensure-valid-vehicle-status.patch index 5ac14513e9..e090a4f829 100644 --- a/patches/server/0732-Ensure-valid-vehicle-status.patch +++ b/patches/unapplied/server/0732-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 93fc24962062acf1425a475f8781b6d8827a5af8..d5b0777219c78aaff5c87fe8f422e67952ac241b 100644 +index 76ab004580f48fefdeec03b727f1589963c4684a..e7d299469652ebc24c2868d447916b5999bd140d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -518,7 +518,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0733-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/0733-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/unapplied/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0735-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0735-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0735-Don-t-log-debug-logging-being-disabled.patch rename to patches/unapplied/server/0735-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0736-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0736-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0736-fix-various-menus-with-empty-level-accesses.patch rename to patches/unapplied/server/0736-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0737-Preserve-overstacked-loot.patch b/patches/unapplied/server/0737-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0737-Preserve-overstacked-loot.patch rename to patches/unapplied/server/0737-Preserve-overstacked-loot.patch diff --git a/patches/server/0738-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0738-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0738-Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/0738-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0739-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0739-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0739-prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/0739-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0740-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0740-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0740-Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/0740-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0741-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0741-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0741-Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/0741-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0742-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/unapplied/server/0742-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0743-Configurable-feature-seeds.patch b/patches/unapplied/server/0743-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0743-Configurable-feature-seeds.patch rename to patches/unapplied/server/0743-Configurable-feature-seeds.patch diff --git a/patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/unapplied/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0745-Add-root-admin-user-detection.patch b/patches/unapplied/server/0745-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0745-Add-root-admin-user-detection.patch rename to patches/unapplied/server/0745-Add-root-admin-user-detection.patch diff --git a/patches/server/0746-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0746-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0746-Always-allow-item-changing-in-Fireball.patch rename to patches/unapplied/server/0746-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0747-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch rename to patches/unapplied/server/0747-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 94% rename from patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch index fc4d8ad38a..835b7fda81 100644 --- a/patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/unapplied/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 865d774135f8417142287cc9efd8ca5ec909a04a..39c2cd8b100ab93d27a61d46b8f2d3fc354a824a 100644 +index b7cc5fb5798d703124e08afc850c24afb2d6ee69..f833d578009bb470855e7ccdc017567a2df8f580 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2672,14 +2672,27 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/unapplied/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/unapplied/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0751-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/unapplied/server/0751-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 97% rename from patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/unapplied/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch index 4dff623c27..c20ce1b269 100644 --- a/patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/unapplied/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,7 +34,7 @@ index 64683e218c9c43cfd30514800cfa8da42e37563e..d2fed123ed56eaf550ac2c7a3fcc1678 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 39c2cd8b100ab93d27a61d46b8f2d3fc354a824a..7dbdcd6ba2c17a0320ae1ca872274207c125bf75 100644 +index f833d578009bb470855e7ccdc017567a2df8f580..cd053c211c893f9b9c83204eccf9f40d7910ab7f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3158,7 +3158,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0753-Hide-unnecessary-itemmeta-from-clients.patch similarity index 97% rename from patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/unapplied/server/0753-Hide-unnecessary-itemmeta-from-clients.patch index 15d77ef391..a278a0ae6a 100644 --- a/patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/unapplied/server/0753-Hide-unnecessary-itemmeta-from-clients.patch @@ -18,7 +18,7 @@ index d2fed123ed56eaf550ac2c7a3fcc1678a127bba3..77443525e68fab0211ff48af12020ff0 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 411b555415f90504adadddc67387276ba340f360..cc667a99b17fb8f87e75e552964a8cef66c19131 100644 +index d9a44cc361b1e4a307d91e12a90986a2bbca550d..4246d9a24635024ed82fa103852b8337117a6b32 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2683,8 +2683,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -33,7 +33,7 @@ index 411b555415f90504adadddc67387276ba340f360..cc667a99b17fb8f87e75e552964a8cef } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7dbdcd6ba2c17a0320ae1ca872274207c125bf75..5e9f0a30778091c54f064073811f95d9ef2990e0 100644 +index cd053c211c893f9b9c83204eccf9f40d7910ab7f..c1185c4bd9151b08a9c7707e2eb8517bbeb47919 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3160,7 +3160,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0754-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0754-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0754-Fix-Spigot-growth-modifiers.patch rename to patches/unapplied/server/0754-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0756-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0756-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0756-Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/0756-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0757-Add-player-health-update-API.patch b/patches/unapplied/server/0757-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0757-Add-player-health-update-API.patch rename to patches/unapplied/server/0757-Add-player-health-update-API.patch diff --git a/patches/server/0758-Optimize-HashMapPalette.patch b/patches/unapplied/server/0758-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0758-Optimize-HashMapPalette.patch rename to patches/unapplied/server/0758-Optimize-HashMapPalette.patch diff --git a/patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/unapplied/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index 31d45af3a7..98cf381a47 100644 --- a/patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/unapplied/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d5b0777219c78aaff5c87fe8f422e67952ac241b..0c212a2136b4d275aa0d7e31af19f90d96cca2ac 100644 +index e7d299469652ebc24c2868d447916b5999bd140d..c2b883f47829b7b14d1fdd69d2e9bc563f708e53 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -411,7 +411,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/unapplied/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch index 4e03570d78..aeb83950c6 100644 --- a/patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/unapplied/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cc667a99b17fb8f87e75e552964a8cef66c19131..5adbb9bf95df8940d55f66b1e583a11e3d5c925a 100644 +index 4246d9a24635024ed82fa103852b8337117a6b32..a036621f28f42151871c78337290e1158f1ca83f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -643,7 +643,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/unapplied/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0763-Add-more-Campfire-API.patch b/patches/unapplied/server/0763-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0763-Add-more-Campfire-API.patch rename to patches/unapplied/server/0763-Add-more-Campfire-API.patch diff --git a/patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/unapplied/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0765-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0765-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0765-Fix-tripwire-state-inconsistency.patch rename to patches/unapplied/server/0765-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0766-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0766-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0766-Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/0766-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0767-Improve-scoreboard-entries.patch b/patches/unapplied/server/0767-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0767-Improve-scoreboard-entries.patch rename to patches/unapplied/server/0767-Improve-scoreboard-entries.patch diff --git a/patches/server/0768-Entity-powdered-snow-API.patch b/patches/unapplied/server/0768-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0768-Entity-powdered-snow-API.patch rename to patches/unapplied/server/0768-Entity-powdered-snow-API.patch diff --git a/patches/server/0769-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0769-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0769-Add-API-for-item-entity-health.patch rename to patches/unapplied/server/0769-Add-API-for-item-entity-health.patch diff --git a/patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/unapplied/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0771-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch rename to patches/unapplied/server/0771-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/unapplied/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0775-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0775-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0775-Fix-bees-aging-inside-hives.patch rename to patches/unapplied/server/0775-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0776-Bucketable-API.patch b/patches/unapplied/server/0776-Bucketable-API.patch similarity index 100% rename from patches/server/0776-Bucketable-API.patch rename to patches/unapplied/server/0776-Bucketable-API.patch diff --git a/patches/server/0777-Validate-usernames.patch b/patches/unapplied/server/0777-Validate-usernames.patch similarity index 100% rename from patches/server/0777-Validate-usernames.patch rename to patches/unapplied/server/0777-Validate-usernames.patch diff --git a/patches/server/0778-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0778-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0778-Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/0778-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 98% rename from patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 2bae3d7dd4..c2b46d45ce 100644 --- a/patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/unapplied/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -31,7 +31,7 @@ index c4d5f3482881376bde77e826009a383804a2203d..759d091593b75419e275e79eaa3afbfb biomeProvider = generator.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c8e798cb13ffc1800fb04cdf0516a1f787f1da56..24366ba6c95284b18d6caa3205efd86efe61aadd 100644 +index 778d7503af4ab00e217c12b314c8ca4ccceae411..08fc562b69f93d6be21124ec4309580a26ad5c85 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -199,6 +199,30 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/unapplied/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/unapplied/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0782-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0782-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0782-Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/0782-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0783-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0783-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0783-Reset-placed-block-on-exception.patch rename to patches/unapplied/server/0783-Reset-placed-block-on-exception.patch diff --git a/patches/server/0784-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0784-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0784-Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/0784-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0786-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0786-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0786-Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/0786-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0787-Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/0787-Kick-on-main-for-illegal-chat.patch similarity index 97% rename from patches/server/0787-Kick-on-main-for-illegal-chat.patch rename to patches/unapplied/server/0787-Kick-on-main-for-illegal-chat.patch index 9019eda9c6..21eab8eb33 100644 --- a/patches/server/0787-Kick-on-main-for-illegal-chat.patch +++ b/patches/unapplied/server/0787-Kick-on-main-for-illegal-chat.patch @@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for illegal characters or chat out-of-order errors. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d13ee7756a8bdd9eb71b448a1eeb1415cb25556e..8317ff897930f1114586f33f6b05e3c228e7785a 100644 +index a036621f28f42151871c78337290e1158f1ca83f..7a274daf2dcc96ce529708293cf0708456067188 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2168,7 +2168,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0788-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0788-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0788-Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/0788-Multi-Block-Change-API-Implementation.patch index 3013eb9b82..171099d3fe 100644 --- a/patches/server/0788-Multi-Block-Change-API-Implementation.patch +++ b/patches/unapplied/server/0788-Multi-Block-Change-API-Implementation.patch @@ -25,7 +25,7 @@ index 0d851e197e65ec79386ad1f981f6d1d38b65124a..24c677e80af652952263253409c05064 public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 070eaaf9b92757ead4cba398025412f68fcb8bc9..118a671cdeee8c5fd051192b7b72ad63f79e7eca 100644 +index 13855196d3c5405116bcd60518e8dd6b4fa0bf3f..7034ca7b50c12b000abf33b14fbe216fe8b14a8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -943,6 +943,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0789-Fix-NotePlayEvent.patch b/patches/unapplied/server/0789-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0789-Fix-NotePlayEvent.patch rename to patches/unapplied/server/0789-Fix-NotePlayEvent.patch diff --git a/patches/server/0790-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0790-Freeze-Tick-Lock-API.patch similarity index 97% rename from patches/server/0790-Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/0790-Freeze-Tick-Lock-API.patch index 80e7185949..ba8cd4ccc6 100644 --- a/patches/server/0790-Freeze-Tick-Lock-API.patch +++ b/patches/unapplied/server/0790-Freeze-Tick-Lock-API.patch @@ -46,7 +46,7 @@ index 9bbc8e1f15b5dfc62bcb065d6ebb87fa58afb91e..ac9a612488bf8a3efdfbfbfe9fb1de81 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5e9f0a30778091c54f064073811f95d9ef2990e0..04df7f6d7a406b939b20cb16504ba4f603e5c5f2 100644 +index c1185c4bd9151b08a9c7707e2eb8517bbeb47919..13ff58b76d7c1c02921ee3266a67f7c5befef30e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3411,7 +3411,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0791-Dolphin-API.patch b/patches/unapplied/server/0791-Dolphin-API.patch similarity index 100% rename from patches/server/0791-Dolphin-API.patch rename to patches/unapplied/server/0791-Dolphin-API.patch diff --git a/patches/server/0792-More-PotionEffectType-API.patch b/patches/unapplied/server/0792-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0792-More-PotionEffectType-API.patch rename to patches/unapplied/server/0792-More-PotionEffectType-API.patch diff --git a/patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/unapplied/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0795-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0795-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0795-Add-missing-structure-set-seed-configs.patch rename to patches/unapplied/server/0795-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0796-Implement-regenerateChunk.patch b/patches/unapplied/server/0796-Implement-regenerateChunk.patch similarity index 98% rename from patches/server/0796-Implement-regenerateChunk.patch rename to patches/unapplied/server/0796-Implement-regenerateChunk.patch index 1fe79c280b..d39e55fd9d 100644 --- a/patches/server/0796-Implement-regenerateChunk.patch +++ b/patches/unapplied/server/0796-Implement-regenerateChunk.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 24366ba6c95284b18d6caa3205efd86efe61aadd..0f13354db729fbc5ad299dd36ba54f64332ca21f 100644 +index 08fc562b69f93d6be21124ec4309580a26ad5c85..7fc663f4e91fa885a7977638e423b1cce6efce39 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -138,6 +138,7 @@ import org.bukkit.util.Vector; diff --git a/patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/unapplied/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0799-Add-GameEvent-tags.patch b/patches/unapplied/server/0799-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0799-Add-GameEvent-tags.patch rename to patches/unapplied/server/0799-Add-GameEvent-tags.patch diff --git a/patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/unapplied/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0801-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0801-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0801-Furnace-RecipesUsed-API.patch rename to patches/unapplied/server/0801-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0802-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0802-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0802-Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/server/0802-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0803-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0803-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0803-Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/server/0803-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/unapplied/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0805-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/unapplied/server/0805-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0806-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0806-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0806-Fix-Entity-Position-Desync.patch rename to patches/unapplied/server/0806-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0807-Custom-Potion-Mixes.patch b/patches/unapplied/server/0807-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0807-Custom-Potion-Mixes.patch rename to patches/unapplied/server/0807-Custom-Potion-Mixes.patch diff --git a/patches/server/0808-Force-close-world-loading-screen.patch b/patches/unapplied/server/0808-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0808-Force-close-world-loading-screen.patch rename to patches/unapplied/server/0808-Force-close-world-loading-screen.patch diff --git a/patches/server/0809-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0809-Fix-falling-block-spawn-methods.patch similarity index 97% rename from patches/server/0809-Fix-falling-block-spawn-methods.patch rename to patches/unapplied/server/0809-Fix-falling-block-spawn-methods.patch index 39a43ccd7e..2fff870168 100644 --- a/patches/server/0809-Fix-falling-block-spawn-methods.patch +++ b/patches/unapplied/server/0809-Fix-falling-block-spawn-methods.patch @@ -24,7 +24,7 @@ index bb486249d409743b0fc9891ac5ae76a38034800b..e365081bf532488f2b41b22deb2fb234 if (Snowball.class.isAssignableFrom(clazz)) { entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0f13354db729fbc5ad299dd36ba54f64332ca21f..aa6a2f8fff6d2f4978cee2ae2ed0d0ee2fffb950 100644 +index 7fc663f4e91fa885a7977638e423b1cce6efce39..7aa3200ef7e8031b7adee71f37e43458cde4e353 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1394,7 +1394,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0810-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0810-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0810-Expose-furnace-minecart-push-values.patch rename to patches/unapplied/server/0810-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/unapplied/server/0811-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0812-More-Projectile-API.patch b/patches/unapplied/server/0812-More-Projectile-API.patch similarity index 100% rename from patches/server/0812-More-Projectile-API.patch rename to patches/unapplied/server/0812-More-Projectile-API.patch diff --git a/patches/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/unapplied/server/0813-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 93% rename from patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/unapplied/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch index df97f9e145..cafbde20a8 100644 --- a/patches/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/unapplied/server/0814-Don-t-allow-vehicle-movement-from-players-while-tele.patch @@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the regular player move packet. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2e1141b7672907b1a0b807e4e0e0d5233480e5d6..023b58f9353ed8945a80243ba5af13a3ac34feb6 100644 +index 7a274daf2dcc96ce529708293cf0708456067188..60b04bbca2e04f64962ad5b1d3e3d303c78a4929 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -573,6 +573,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0815-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0815-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0815-Implement-getComputedBiome-API.patch rename to patches/unapplied/server/0815-Implement-getComputedBiome-API.patch diff --git a/patches/server/0816-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0816-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0816-Make-some-itemstacks-nonnull.patch rename to patches/unapplied/server/0816-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0817-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0817-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0817-Implement-enchantWithLevels-API.patch rename to patches/unapplied/server/0817-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0818-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0818-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0818-Fix-saving-in-unloadWorld.patch rename to patches/unapplied/server/0818-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0819-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0819-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0819-Buffer-OOB-setBlock-calls.patch rename to patches/unapplied/server/0819-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0820-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0820-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0820-Add-TameableDeathMessageEvent.patch rename to patches/unapplied/server/0820-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/unapplied/server/0821-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 92% rename from patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/unapplied/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch index 6fd169c224..d3b93e854b 100644 --- a/patches/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch +++ b/patches/unapplied/server/0822-fix-player-loottables-running-when-mob-loot-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0c212a2136b4d275aa0d7e31af19f90d96cca2ac..833a431567693121acb9b4d8e8ecb71b9c583e1c 100644 +index c2b883f47829b7b14d1fdd69d2e9bc563f708e53..f01586da79b5e3965d90ed143204f9636d35ecaa 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -866,12 +866,14 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/unapplied/server/0823-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0824-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0824-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0824-Guard-against-invalid-entity-positions.patch rename to patches/unapplied/server/0824-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0825-cache-resource-keys.patch b/patches/unapplied/server/0825-cache-resource-keys.patch similarity index 100% rename from patches/server/0825-cache-resource-keys.patch rename to patches/unapplied/server/0825-cache-resource-keys.patch diff --git a/patches/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/unapplied/server/0826-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/unapplied/server/0827-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/unapplied/server/0828-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0829-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0829-Prevent-tile-entity-copies-loading-chunks.patch similarity index 93% rename from patches/server/0829-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/unapplied/server/0829-Prevent-tile-entity-copies-loading-chunks.patch index b78d274572..c0807a966a 100644 --- a/patches/server/0829-Prevent-tile-entity-copies-loading-chunks.patch +++ b/patches/unapplied/server/0829-Prevent-tile-entity-copies-loading-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 023b58f9353ed8945a80243ba5af13a3ac34feb6..c8a8570b694e649886a46cd9776acd8d748a92a7 100644 +index 60b04bbca2e04f64962ad5b1d3e3d303c78a4929..5a9be5839b1e93b18408bb6b29306b8b39b302c9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3286,7 +3286,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/unapplied/server/0830-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/unapplied/server/0831-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 98% rename from patches/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/unapplied/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch index 815417382c..c26dd629ff 100644 --- a/patches/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/unapplied/server/0832-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -18,7 +18,7 @@ index 5b46cabf4f2e2a1f7feaad378dd98d64aeef8671..51b3db0b6c2cede95b584268e035c0fb if (dedicatedserverproperties.enableQuery) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c8a8570b694e649886a46cd9776acd8d748a92a7..a29c3a4314d6ac4b18dd873dd6260488efcb8a89 100644 +index 5a9be5839b1e93b18408bb6b29306b8b39b302c9..3d4ad106222d0bc365c3207e5b414539ffc861ec 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2877,7 +2877,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -158,7 +158,7 @@ index fa8cd4438c19a262272da47985a57f7e84654f1b..663c1d8c1611af915a1bae733920dd75 this.onChanged(server); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index aa6a2f8fff6d2f4978cee2ae2ed0d0ee2fffb950..8100b2f7627b667fee57504755c8b9fc71e77a74 100644 +index 7aa3200ef7e8031b7adee71f37e43458cde4e353..e5bafab042767f483e09fa0d164f91e4a6f06160 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1914,7 +1914,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/unapplied/server/0833-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0834-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0834-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0834-WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/server/0834-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/unapplied/server/0835-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/unapplied/server/0836-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/server/0837-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/unapplied/server/0838-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/unapplied/server/0839-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0840-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0840-Add-PlayerStopUsingItemEvent.patch similarity index 91% rename from patches/server/0840-Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/server/0840-Add-PlayerStopUsingItemEvent.patch index 641257376b..f35d4c81a4 100644 --- a/patches/server/0840-Add-PlayerStopUsingItemEvent.patch +++ b/patches/unapplied/server/0840-Add-PlayerStopUsingItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 04df7f6d7a406b939b20cb16504ba4f603e5c5f2..8433a1359a742f8947a328cc621c0ff4f64977f0 100644 +index 13ff58b76d7c1c02921ee3266a67f7c5befef30e..98dac3d0288902265beb07ff17c5ae1bebeb2cfc 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3974,6 +3974,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0841-FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/0841-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0841-FallingBlock-auto-expire-setting.patch rename to patches/unapplied/server/0841-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0842-Don-t-tick-markers.patch b/patches/unapplied/server/0842-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0842-Don-t-tick-markers.patch rename to patches/unapplied/server/0842-Don-t-tick-markers.patch diff --git a/patches/server/0843-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0843-Do-not-accept-invalid-client-settings.patch similarity index 93% rename from patches/server/0843-Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/0843-Do-not-accept-invalid-client-settings.patch index 6abe25b283..fc6ec75c9b 100644 --- a/patches/server/0843-Do-not-accept-invalid-client-settings.patch +++ b/patches/unapplied/server/0843-Do-not-accept-invalid-client-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a29c3a4314d6ac4b18dd873dd6260488efcb8a89..0ad005927d6b03d3fc231030bfbfdffe10f11649 100644 +index 3d4ad106222d0bc365c3207e5b414539ffc861ec..9834ee213dcffc35aba1df8d3f9f00a9bbfc1b45 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3465,6 +3465,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0844-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0844-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0844-Add-support-for-Proxy-Protocol.patch rename to patches/unapplied/server/0844-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/unapplied/server/0845-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/unapplied/server/0846-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0847-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0847-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0847-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/unapplied/server/0847-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0848-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0848-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0848-Prevent-entity-loading-causing-async-lookups.patch rename to patches/unapplied/server/0848-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0849-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0849-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0849-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/unapplied/server/0849-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0850-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0850-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0850-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/unapplied/server/0850-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0851-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0851-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0851-Add-Alternate-Current-redstone-implementation.patch rename to patches/unapplied/server/0851-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0852-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0852-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0852-Dont-resent-entity-on-art-update.patch rename to patches/unapplied/server/0852-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0853-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0853-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0853-Add-WardenAngerChangeEvent.patch rename to patches/unapplied/server/0853-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0854-Add-option-for-strict-advancement-dimension-checks.patch similarity index 94% rename from patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/unapplied/server/0854-Add-option-for-strict-advancement-dimension-checks.patch index 2f47d6f144..eacd845503 100644 --- a/patches/server/0854-Add-option-for-strict-advancement-dimension-checks.patch +++ b/patches/unapplied/server/0854-Add-option-for-strict-advancement-dimension-checks.patch @@ -11,7 +11,7 @@ distance trigger. This adds a config option to ignore that and use the exact dimension key of the worlds involved. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 833a431567693121acb9b4d8e8ecb71b9c583e1c..472f4b8bbd609aa3776c38a6b8cbec61a73b4209 100644 +index f01586da79b5e3965d90ed143204f9636d35ecaa..c7b030ee8973e9e7fdc3ed584229d049d5afe134 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1258,6 +1258,12 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0855-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0855-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0855-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/unapplied/server/0855-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0856-Nameable-Banner-API.patch b/patches/unapplied/server/0856-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0856-Nameable-Banner-API.patch rename to patches/unapplied/server/0856-Nameable-Banner-API.patch diff --git a/patches/server/0857-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0857-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0857-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/unapplied/server/0857-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0858-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0858-Prevent-empty-items-from-being-added-to-world.patch similarity index 96% rename from patches/server/0858-Prevent-empty-items-from-being-added-to-world.patch rename to patches/unapplied/server/0858-Prevent-empty-items-from-being-added-to-world.patch index 0e99e8b3bb..db5f8bc8b4 100644 --- a/patches/server/0858-Prevent-empty-items-from-being-added-to-world.patch +++ b/patches/unapplied/server/0858-Prevent-empty-items-from-being-added-to-world.patch @@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca Just simply prevent them from being added to the world instead. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 4029f898b16205bf6779ee3b38dd2223d01ee27e..02c8e154b424b7bfae9ff28b6acfc0362721d2e8 100644 +index dd4bd208fba1806a298ccc76d64efdcb2a061be7..e9457d8a29d1f54af8415ad006b75d567e524a46 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1504,6 +1504,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/unapplied/server/0859-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 94% rename from patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/unapplied/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch index a26d388480..63a9456e32 100644 --- a/patches/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/unapplied/server/0860-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0ad005927d6b03d3fc231030bfbfdffe10f11649..fcfd8ff903dbfcd3bdeb1af68277fbc5ab0f2d91 100644 +index 9834ee213dcffc35aba1df8d3f9f00a9bbfc1b45..6e689b558450a5b2b707cb355418fbe5f1115365 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2041,7 +2041,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0861-Add-Player-getFishHook.patch b/patches/unapplied/server/0861-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0861-Add-Player-getFishHook.patch rename to patches/unapplied/server/0861-Add-Player-getFishHook.patch diff --git a/patches/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/unapplied/server/0862-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/unapplied/server/0863-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 94% rename from patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/unapplied/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch index 19c7d24651..801e2e3d65 100644 --- a/patches/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/unapplied/server/0864-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fcfd8ff903dbfcd3bdeb1af68277fbc5ab0f2d91..400775b6c88a68c81a7f074844588ea308fb84ea 100644 +index 6e689b558450a5b2b707cb355418fbe5f1115365..7160297203de40e5158fc34341ebec723ffcf750 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2291,7 +2291,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0865-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0865-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0865-Fix-Bee-flower-NPE.patch rename to patches/unapplied/server/0865-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/unapplied/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index b1bf2a4d10..a29c11affe 100644 --- a/patches/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/unapplied/server/0866-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 400775b6c88a68c81a7f074844588ea308fb84ea..5f2ca04a299b61f2cce8a4dfd060485e05153650 100644 +index 7160297203de40e5158fc34341ebec723ffcf750..a603bc195462227a6737d2d3f9bc247c630c4012 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2536,7 +2536,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0867-More-Teleport-API.patch b/patches/unapplied/server/0867-More-Teleport-API.patch similarity index 100% rename from patches/server/0867-More-Teleport-API.patch rename to patches/unapplied/server/0867-More-Teleport-API.patch diff --git a/patches/server/0868-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0868-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0868-Add-EntityPortalReadyEvent.patch rename to patches/unapplied/server/0868-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0869-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0869-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0869-Don-t-use-level-random-in-entity-constructors.patch rename to patches/unapplied/server/0869-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0870-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0870-Send-block-entities-after-destroy-prediction.patch similarity index 98% rename from patches/server/0870-Send-block-entities-after-destroy-prediction.patch rename to patches/unapplied/server/0870-Send-block-entities-after-destroy-prediction.patch index feff7dfed9..4b8b876397 100644 --- a/patches/server/0870-Send-block-entities-after-destroy-prediction.patch +++ b/patches/unapplied/server/0870-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 796d17f51496974cfdfed2593753b8c09b5c81c1..13031576c20bda3bb12c926f6cd938fa } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c1041c3832c73728cbb146815ca3c03b3ba41dc4..7183db74a3ebd7d278b7bf65de49dd1cde11611f 100644 +index a5734228fbad1b9e704573ea220084a8c142e069..aef7e2ee25e9ad17ec85b701b516cc45a5b6f451 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1863,8 +1863,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 98% rename from patches/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/unapplied/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch index 913854fa97..bffbb8c98a 100644 --- a/patches/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch +++ b/patches/unapplied/server/0871-Warn-on-plugins-accessing-faraway-chunks.patch @@ -18,7 +18,7 @@ index 807b58b1a7a9a01faef7f42aba022ed467fa607e..2ecd29a24545418a2f6e2b2091d84831 private static boolean isOutsideSpawnableHeight(int y) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8100b2f7627b667fee57504755c8b9fc71e77a74..54932d92b13b890b07f827c5f09bd137383d4ab5 100644 +index e5bafab042767f483e09fa0d164f91e4a6f06160..c91bac6f3f1d60c950b93d157531cd8f7500e8d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0872-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch rename to patches/unapplied/server/0872-Custom-Chat-Completion-Suggestions-API.patch index 4c1a01216b..2c60b354d4 100644 --- a/patches/server/0872-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/unapplied/server/0872-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ddafba3daa668281134ec348c6fda48cfab1a007..89a3ff58e574485ccfdf55db3172a74aa63b4818 100644 +index 977063eeaa1d8864a86f48f87d820d01d14e5bb6..7d3fe4b49a7a83ea619c1ecb1ec923cda151219c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -665,6 +665,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0873-Add-missing-BlockFadeEvents.patch b/patches/unapplied/server/0873-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0873-Add-missing-BlockFadeEvents.patch rename to patches/unapplied/server/0873-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0874-Collision-API.patch b/patches/unapplied/server/0874-Collision-API.patch similarity index 96% rename from patches/server/0874-Collision-API.patch rename to patches/unapplied/server/0874-Collision-API.patch index 58ae3d24fd..6ac58e544c 100644 --- a/patches/server/0874-Collision-API.patch +++ b/patches/unapplied/server/0874-Collision-API.patch @@ -22,7 +22,7 @@ index 446657577aa843e6ebc5143b6c511f33d27b6360..d99f079e03d0541d7aa3c70d9e8c12b8 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4ad29426a638d16aa76b2d2239f09d46a72bf2c8..3145a5cba793d94ca649eb99dd6b69bed5bb759c 100644 +index 13dbac3b3aa7d67320203b64eaa130925ba0fbbf..0b4686c67276cea153bdd57f11c9b48a4dd1b4ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1380,4 +1380,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/unapplied/server/0875-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0876-Remove-invalid-signature-login-stacktrace.patch b/patches/unapplied/server/0876-Remove-invalid-signature-login-stacktrace.patch similarity index 93% rename from patches/server/0876-Remove-invalid-signature-login-stacktrace.patch rename to patches/unapplied/server/0876-Remove-invalid-signature-login-stacktrace.patch index 5e8f59ae84..7d9ff99170 100644 --- a/patches/server/0876-Remove-invalid-signature-login-stacktrace.patch +++ b/patches/unapplied/server/0876-Remove-invalid-signature-login-stacktrace.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7183db74a3ebd7d278b7bf65de49dd1cde11611f..7a6736cdd31bc1832965cc72596b643deaccc07b 100644 +index aef7e2ee25e9ad17ec85b701b516cc45a5b6f451..3e884720d242936225b558152763c68dc8370fd8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3595,7 +3595,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/unapplied/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch similarity index 91% rename from patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch rename to patches/unapplied/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch index 7698ed96bf..c0f9a2be31 100644 --- a/patches/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch +++ b/patches/unapplied/server/0877-Add-async-catcher-to-PlayerConnection-internalTelepo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7a6736cdd31bc1832965cc72596b643deaccc07b..834b899ec913def6fe4f517f5b76c9c0f92c970b 100644 +index 3e884720d242936225b558152763c68dc8370fd8..cc780cfc359bb1872cd78136497f94cc7e2a67c4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1746,6 +1746,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0878-Block-Ticking-API.patch b/patches/unapplied/server/0878-Block-Ticking-API.patch similarity index 100% rename from patches/server/0878-Block-Ticking-API.patch rename to patches/unapplied/server/0878-Block-Ticking-API.patch diff --git a/patches/server/0879-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0879-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0879-Add-Velocity-IP-Forwarding-Support.patch rename to patches/unapplied/server/0879-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/unapplied/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/unapplied/server/0880-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0881-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0881-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0881-Add-NamespacedKey-biome-methods.patch rename to patches/unapplied/server/0881-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0882-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0882-Fix-plugin-loggers-on-server-shutdown.patch similarity index 96% rename from patches/server/0882-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/unapplied/server/0882-Fix-plugin-loggers-on-server-shutdown.patch index 6ed34a73da..3dcaae34d4 100644 --- a/patches/server/0882-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/unapplied/server/0882-Fix-plugin-loggers-on-server-shutdown.patch @@ -49,7 +49,7 @@ index 1b56bb2869d3cf22670b508133968e66493a5bec..753a917d34a1e1c1521a8916bc8e44a6 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 4714e0199987d864b37aaec94ffa885a5b76b437..190e17eb28d166aedee06e9578561ba402d1b6d2 100644 +index 0aef4fc4a89e627bc80504d7402f1ca2cdc95a74..f30621be24c6c3a4f173436fce1ad1c13507c84f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -20,6 +20,12 @@ public class Main { diff --git a/patches/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/unapplied/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch similarity index 100% rename from patches/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/unapplied/server/0883-Workaround-for-client-lag-spikes-MC-162253.patch diff --git a/patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0884-Stop-large-look-changes-from-crashing-the-server.patch similarity index 96% rename from patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/unapplied/server/0884-Stop-large-look-changes-from-crashing-the-server.patch index b522ef8dac..ed2cd23266 100644 --- a/patches/server/0884-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/unapplied/server/0884-Stop-large-look-changes-from-crashing-the-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server Co-authored-by: Jaren Knodel diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8433a1359a742f8947a328cc621c0ff4f64977f0..c9c16dfffa782b82c1697f3819591077995760d3 100644 +index 98dac3d0288902265beb07ff17c5ae1bebeb2cfc..c9b072a6324e5facdb85db1caaa7e763191f7104 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3028,37 +3028,15 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/unapplied/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 94% rename from patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/unapplied/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch index bf3b9ec551..23fa45236f 100644 --- a/patches/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch +++ b/patches/unapplied/server/0885-Add-custom-destroyerIdentity-to-sendBlockDamage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 89a3ff58e574485ccfdf55db3172a74aa63b4818..6d1309e811e299984823caab24325fa6970dee57 100644 +index 7d3fe4b49a7a83ea619c1ecb1ec923cda151219c..fb2c4547896fc39a78bc28261a5a6c3764527f6a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1028,13 +1028,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/unapplied/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/unapplied/server/0886-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/unapplied/server/0887-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0888-Missing-eating-regain-reason.patch b/patches/unapplied/server/0888-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0888-Missing-eating-regain-reason.patch rename to patches/unapplied/server/0888-Missing-eating-regain-reason.patch diff --git a/patches/server/0889-Missing-effect-cause.patch b/patches/unapplied/server/0889-Missing-effect-cause.patch similarity index 100% rename from patches/server/0889-Missing-effect-cause.patch rename to patches/unapplied/server/0889-Missing-effect-cause.patch diff --git a/patches/server/0890-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0890-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0890-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/unapplied/server/0890-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/unapplied/server/0891-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0892-Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/0892-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0892-Call-BlockPhysicsEvent-more-often.patch rename to patches/unapplied/server/0892-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0893-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0893-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0893-Configurable-chat-thread-limit.patch rename to patches/unapplied/server/0893-Configurable-chat-thread-limit.patch diff --git a/patches/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/unapplied/server/0894-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch b/patches/unapplied/server/0895-Set-position-before-player-sending-on-dimension-chan.patch similarity index 92% rename from patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/unapplied/server/0895-Set-position-before-player-sending-on-dimension-chan.patch index df2a0e624b..df629fa41c 100644 --- a/patches/server/0895-Set-position-before-player-sending-on-dimension-chan.patch +++ b/patches/unapplied/server/0895-Set-position-before-player-sending-on-dimension-chan.patch @@ -7,7 +7,7 @@ This causes a moment where the player entity is sent with the previous location, teleport packet which is sent shortly after is meant to correct that. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 472f4b8bbd609aa3776c38a6b8cbec61a73b4209..9187ac335e9e459df4832e95a5691db0644892e5 100644 +index c7b030ee8973e9e7fdc3ed584229d049d5afe134..32ea4c421ef65a4abce168860ccd24c18a416f0a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1161,6 +1161,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0896-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0896-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0896-fix-Jigsaw-block-kicking-user.patch rename to patches/unapplied/server/0896-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 95% rename from patches/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/unapplied/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch index a9c43fd90c..ef6f6a342e 100644 --- a/patches/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch +++ b/patches/unapplied/server/0897-use-BlockFormEvent-for-mud-converting-into-clay.patch @@ -5,7 +5,7 @@ Subject: [PATCH] use BlockFormEvent for mud converting into clay diff --git a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java -index 24524b673f78da1ce138b72d6d879c2e690f19ea..e78fdd317d59cfca6a28deb6e0bd02aabe91e930 100644 +index 01da5a5684692b3ed2e06834d6f926706925f643..1d7149fb6baeaf045c3680b6dec293f074614612 100644 --- a/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java +++ b/src/main/java/net/minecraft/world/level/block/PointedDripstoneBlock.java @@ -213,10 +213,13 @@ public class PointedDripstoneBlock extends Block implements Fallable, SimpleWate diff --git a/patches/server/0898-Add-getDrops-to-BlockState.patch b/patches/unapplied/server/0898-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0898-Add-getDrops-to-BlockState.patch rename to patches/unapplied/server/0898-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0899-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0899-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0899-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/unapplied/server/0899-Fix-a-bunch-of-vanilla-bugs.patch index a93dc50a73..da1ef7fea7 100644 --- a/patches/server/0899-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/unapplied/server/0899-Fix-a-bunch-of-vanilla-bugs.patch @@ -100,7 +100,7 @@ index 11829c65f459c94db31319352d4650278353f0c0..b53e04854f960682fae94bb2ef5a12e4 @Nullable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c9c16dfffa782b82c1697f3819591077995760d3..cb8fa79db4b06bebc0cfab45d745c055475ca788 100644 +index c9b072a6324e5facdb85db1caaa7e763191f7104..ae7ce73074e12584036288b98e38eec0b55d5982 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2207,8 +2207,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/unapplied/server/0900-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0901-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0901-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0901-Fix-custom-piglin-loved-items.patch rename to patches/unapplied/server/0901-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0902-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0902-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0902-EntityPickupItemEvent-fixes.patch rename to patches/unapplied/server/0902-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/unapplied/server/0903-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0904-Add-PlayerInventorySlotChangeEvent.patch similarity index 97% rename from patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch rename to patches/unapplied/server/0904-Add-PlayerInventorySlotChangeEvent.patch index 07af25e2fc..47042fc326 100644 --- a/patches/server/0904-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/unapplied/server/0904-Add-PlayerInventorySlotChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9187ac335e9e459df4832e95a5691db0644892e5..44c7f65d93b57cd3fff0b10c1d08a98250f3805f 100644 +index 32ea4c421ef65a4abce168860ccd24c18a416f0a..7baf5c0852b5e2edea6459eb2c8de1ebc1ede822 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -321,6 +321,25 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0905-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0905-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0905-Elder-Guardian-appearance-API.patch rename to patches/unapplied/server/0905-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0906-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/0906-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0906-Allow-changing-bed-s-occupied-property.patch rename to patches/unapplied/server/0906-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0907-Add-entity-knockback-API.patch b/patches/unapplied/server/0907-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0907-Add-entity-knockback-API.patch rename to patches/unapplied/server/0907-Add-entity-knockback-API.patch diff --git a/patches/server/0908-Detect-headless-JREs.patch b/patches/unapplied/server/0908-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0908-Detect-headless-JREs.patch rename to patches/unapplied/server/0908-Detect-headless-JREs.patch diff --git a/patches/server/0909-fixed-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0909-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0909-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/unapplied/server/0909-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0910-optimized-dirt-and-snow-spreading.patch b/patches/unapplied/server/0910-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0910-optimized-dirt-and-snow-spreading.patch rename to patches/unapplied/server/0910-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0911-Added-EntityToggleSitEvent.patch b/patches/unapplied/server/0911-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0911-Added-EntityToggleSitEvent.patch rename to patches/unapplied/server/0911-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0912-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0912-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0912-Add-fire-tick-delay-option.patch rename to patches/unapplied/server/0912-Add-fire-tick-delay-option.patch diff --git a/patches/server/0913-Add-Moving-Piston-API.patch b/patches/unapplied/server/0913-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0913-Add-Moving-Piston-API.patch rename to patches/unapplied/server/0913-Add-Moving-Piston-API.patch diff --git a/patches/server/0914-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0914-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0914-Ignore-impossible-spawn-tick.patch rename to patches/unapplied/server/0914-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/unapplied/server/0915-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/unapplied/server/0916-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/unapplied/server/0917-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0918-Prevent-compass-from-loading-chunks.patch b/patches/unapplied/server/0918-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0918-Prevent-compass-from-loading-chunks.patch rename to patches/unapplied/server/0918-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0919-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0919-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0919-Add-PrePlayerAttackEntityEvent.patch rename to patches/unapplied/server/0919-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0920-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0920-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0920-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/unapplied/server/0920-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/unapplied/server/0921-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0922-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0922-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0922-Add-Player-Warden-Warning-API.patch rename to patches/unapplied/server/0922-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0923-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0923-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0923-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/unapplied/server/0923-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0924-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0924-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0924-Add-paper-dumplisteners-command.patch rename to patches/unapplied/server/0924-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0925-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0925-check-global-player-list-where-appropriate.patch similarity index 98% rename from patches/server/0925-check-global-player-list-where-appropriate.patch rename to patches/unapplied/server/0925-check-global-player-list-where-appropriate.patch index 15843660bf..08427120ba 100644 --- a/patches/server/0925-check-global-player-list-where-appropriate.patch +++ b/patches/unapplied/server/0925-check-global-player-list-where-appropriate.patch @@ -22,7 +22,7 @@ index fe960b254c2c6e4f7122392ce6b5c599b6de3961..e84c67f02bce4c2f9c4eeca1b888d533 + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index cb8fa79db4b06bebc0cfab45d745c055475ca788..1083ff15b5a83c9726441ac8b4aa6700e18a5bf3 100644 +index ae7ce73074e12584036288b98e38eec0b55d5982..b45b17b3c04dd655ad42f5b49c423eab04adce48 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3609,7 +3609,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/unapplied/server/0926-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0927-ItemStack-damage-API.patch b/patches/unapplied/server/0927-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0927-ItemStack-damage-API.patch rename to patches/unapplied/server/0927-ItemStack-damage-API.patch diff --git a/patches/server/0928-Friction-API.patch b/patches/unapplied/server/0928-Friction-API.patch similarity index 98% rename from patches/server/0928-Friction-API.patch rename to patches/unapplied/server/0928-Friction-API.patch index e0835a582d..6327b44e9b 100644 --- a/patches/server/0928-Friction-API.patch +++ b/patches/unapplied/server/0928-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1083ff15b5a83c9726441ac8b4aa6700e18a5bf3..529ea9094c0c7b6263c13b3b7a2d1e652f7bc29e 100644 +index b45b17b3c04dd655ad42f5b49c423eab04adce48..0c4a5991d24ec232d2a95977eb37582b6bd8369c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/unapplied/server/0929-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0930-Fix-player-kick-on-shutdown.patch b/patches/unapplied/server/0930-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0930-Fix-player-kick-on-shutdown.patch rename to patches/unapplied/server/0930-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0931-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0931-Sync-offhand-slot-in-menus.patch similarity index 97% rename from patches/server/0931-Sync-offhand-slot-in-menus.patch rename to patches/unapplied/server/0931-Sync-offhand-slot-in-menus.patch index 2abdfc05cc..c20fcde96d 100644 --- a/patches/server/0931-Sync-offhand-slot-in-menus.patch +++ b/patches/unapplied/server/0931-Sync-offhand-slot-in-menus.patch @@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th by pressing the offhand swap item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 44c7f65d93b57cd3fff0b10c1d08a98250f3805f..9160725f031c9698a00229c3dfa19d39b4a826c1 100644 +index 7baf5c0852b5e2edea6459eb2c8de1ebc1ede822..289429eb464548acc80262a49444f49f8f57fc0c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -290,6 +290,13 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0932-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0932-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0932-Player-Entity-Tracking-Events.patch rename to patches/unapplied/server/0932-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0933-Limit-pet-look-distance.patch b/patches/unapplied/server/0933-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0933-Limit-pet-look-distance.patch rename to patches/unapplied/server/0933-Limit-pet-look-distance.patch diff --git a/patches/server/0934-Properly-resend-entities.patch b/patches/unapplied/server/0934-Properly-resend-entities.patch similarity index 98% rename from patches/server/0934-Properly-resend-entities.patch rename to patches/unapplied/server/0934-Properly-resend-entities.patch index e33ef5123e..8c16eba2e9 100644 --- a/patches/server/0934-Properly-resend-entities.patch +++ b/patches/unapplied/server/0934-Properly-resend-entities.patch @@ -66,7 +66,7 @@ index 755989780c955592e27cae2b4b5f0e90e13543b7..37e193f57938047c8b886ed7d2816411 public static class DataItem { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 834b899ec913def6fe4f517f5b76c9c0f92c970b..354b6e86b789ce80fe8f28384e4ca783c37c9007 100644 +index cc780cfc359bb1872cd78136497f94cc7e2a67c4..0bcfd196f5cdd2fc769755a2f79bb4768e2db66f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2776,7 +2776,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/unapplied/server/0935-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0936-fix-Instruments.patch b/patches/unapplied/server/0936-fix-Instruments.patch similarity index 97% rename from patches/server/0936-fix-Instruments.patch rename to patches/unapplied/server/0936-fix-Instruments.patch index ebe7670451..35319fb498 100644 --- a/patches/server/0936-fix-Instruments.patch +++ b/patches/unapplied/server/0936-fix-Instruments.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments properly handle Player#playNote diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 18c2c1454f8f3319b2a0b7649b99d25933cc18a6..ab11ed9d587b633f0f86f13dcb63adac63c3ff78 100644 +index bd202861639727012506415e4b90f6de808081db..42cff4d205f36a4342e645139bcff86027239b55 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -767,62 +767,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0937-Fix-chunk-snapshot-biome-getter.patch b/patches/unapplied/server/0937-Fix-chunk-snapshot-biome-getter.patch similarity index 100% rename from patches/server/0937-Fix-chunk-snapshot-biome-getter.patch rename to patches/unapplied/server/0937-Fix-chunk-snapshot-biome-getter.patch diff --git a/patches/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/unapplied/server/0938-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0939-Fix-MapLike-Codec-missing-key-selector.patch b/patches/unapplied/server/0939-Fix-MapLike-Codec-missing-key-selector.patch similarity index 100% rename from patches/server/0939-Fix-MapLike-Codec-missing-key-selector.patch rename to patches/unapplied/server/0939-Fix-MapLike-Codec-missing-key-selector.patch diff --git a/patches/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/unapplied/server/0940-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0941-Improve-logging-and-errors.patch b/patches/unapplied/server/0941-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0941-Improve-logging-and-errors.patch rename to patches/unapplied/server/0941-Improve-logging-and-errors.patch diff --git a/patches/server/0942-Fix-explosion-yield-with-new-gamerules.patch b/patches/unapplied/server/0942-Fix-explosion-yield-with-new-gamerules.patch similarity index 100% rename from patches/server/0942-Fix-explosion-yield-with-new-gamerules.patch rename to patches/unapplied/server/0942-Fix-explosion-yield-with-new-gamerules.patch diff --git a/patches/server/0943-Add-BlockLockCheckEvent.patch b/patches/unapplied/server/0943-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0943-Add-BlockLockCheckEvent.patch rename to patches/unapplied/server/0943-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0944-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/0944-Add-Sneaking-API-for-Entities.patch similarity index 91% rename from patches/server/0944-Add-Sneaking-API-for-Entities.patch rename to patches/unapplied/server/0944-Add-Sneaking-API-for-Entities.patch index 538c675c2f..92c31fd238 100644 --- a/patches/server/0944-Add-Sneaking-API-for-Entities.patch +++ b/patches/unapplied/server/0944-Add-Sneaking-API-for-Entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 3145a5cba793d94ca649eb99dd6b69bed5bb759c..b5e5b3c88820a571f4feb439b1e4ebf7dd22555b 100644 +index 0b4686c67276cea153bdd57f11c9b48a4dd1b4ec..750ac80eed6ba03e138dd4c03f57ddfe4a123276 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1163,6 +1163,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0945-Improve-PortalEvents.patch b/patches/unapplied/server/0945-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0945-Improve-PortalEvents.patch rename to patches/unapplied/server/0945-Improve-PortalEvents.patch diff --git a/patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/unapplied/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/unapplied/server/0946-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0947-Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/0947-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0947-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/unapplied/server/0947-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0948-Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/0948-Add-missing-SpigotConfig-logCommands-check.patch similarity index 92% rename from patches/server/0948-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/unapplied/server/0948-Add-missing-SpigotConfig-logCommands-check.patch index e08b24a9fb..9fce188cae 100644 --- a/patches/server/0948-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/unapplied/server/0948-Add-missing-SpigotConfig-logCommands-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 354b6e86b789ce80fe8f28384e4ca783c37c9007..aa11c64c74e1fd875161c9a80a16dbba6738bf1d 100644 +index 0bcfd196f5cdd2fc769755a2f79bb4768e2db66f..ac63b21c5f7996d1cc79d6923887f55f2c91dd05 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2256,7 +2256,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/unapplied/server/0949-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0950-Flying-Fall-Damage.patch b/patches/unapplied/server/0950-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0950-Flying-Fall-Damage.patch rename to patches/unapplied/server/0950-Flying-Fall-Damage.patch diff --git a/patches/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/unapplied/server/0951-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0952-config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/0952-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0952-config-for-disabling-entity-tag-tags.patch rename to patches/unapplied/server/0952-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0953-Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/0953-Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/server/0953-Use-single-player-info-update-packet-on-join.patch rename to patches/unapplied/server/0953-Use-single-player-info-update-packet-on-join.patch index eb84b11d5b..fb945e2590 100644 --- a/patches/server/0953-Use-single-player-info-update-packet-on-join.patch +++ b/patches/unapplied/server/0953-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index aa11c64c74e1fd875161c9a80a16dbba6738bf1d..9b0b42add71172bd154226e51d62cebd8de3542e 100644 +index ac63b21c5f7996d1cc79d6923887f55f2c91dd05..bac6b62419d85b3772ef243aa3d5f73311abdda7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3611,7 +3611,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 95% rename from patches/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/unapplied/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch index 296397eebf..518716095b 100644 --- a/patches/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/unapplied/server/0954-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 529ea9094c0c7b6263c13b3b7a2d1e652f7bc29e..42eb78830855d7282b7f3f1bdbe85e632d489784 100644 +index 0c4a5991d24ec232d2a95977eb37582b6bd8369c..902a19def9d902e7bfb476688354a070633a3454 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1554,7 +1554,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0955-Win-Screen-API.patch b/patches/unapplied/server/0955-Win-Screen-API.patch similarity index 93% rename from patches/server/0955-Win-Screen-API.patch rename to patches/unapplied/server/0955-Win-Screen-API.patch index 0ca67bcf37..4ee83c12a6 100644 --- a/patches/server/0955-Win-Screen-API.patch +++ b/patches/unapplied/server/0955-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d57ace8a5dd316d259644342579aeaaf1810245d..8d4e03c9c9bd41433c9a6a4a9378ed3f0681bfdf 100644 +index b7fb3af8a32c18e1eb078224a69f2fafe203c231..c546a465a2f85e1b0e785074af15546637619e8f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1185,6 +1185,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0956-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/0956-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0956-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/unapplied/server/0956-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0957-Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/0957-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0957-Fix-force-opening-enchantment-tables.patch rename to patches/unapplied/server/0957-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0958-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/0958-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0958-Add-Entity-Body-Yaw-API.patch rename to patches/unapplied/server/0958-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0959-Add-missing-isFuel-Material-entries.patch b/patches/unapplied/server/0959-Add-missing-isFuel-Material-entries.patch similarity index 100% rename from patches/server/0959-Add-missing-isFuel-Material-entries.patch rename to patches/unapplied/server/0959-Add-missing-isFuel-Material-entries.patch diff --git a/patches/server/0960-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/0960-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0960-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/unapplied/server/0960-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0961-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/unapplied/server/0961-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0961-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/unapplied/server/0961-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0962-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/0962-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0962-Add-EntityFertilizeEggEvent.patch rename to patches/unapplied/server/0962-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0963-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/0963-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0963-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/unapplied/server/0963-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0964-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/0964-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0964-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/unapplied/server/0964-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0965-Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/0965-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0965-Correctly-handle-ArmorStand-invisibility.patch rename to patches/unapplied/server/0965-Correctly-handle-ArmorStand-invisibility.patch diff --git a/work/BuildData b/work/BuildData index 177811e1fa..4d9436f7b6 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 177811e1fa90f674897a302820f3ed84e4d65688 +Subproject commit 4d9436f7b66190ad21fe4e3975b73a36b7ad2a7e diff --git a/work/Bukkit b/work/Bukkit index 6b3c598b97..818e4e08d2 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 6b3c598b975cca10e0027f624dc5115e0f32a0bc +Subproject commit 818e4e08d29b914a051f85dc283e3ec4b86f6bb0 diff --git a/work/CraftBukkit b/work/CraftBukkit index b56426c7ae..bcedf28a1b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit b56426c7aeb086a363d7a8ee7f228b31249c7fb8 +Subproject commit bcedf28a1b6f4214539cd7c49b953a0e44039dcf diff --git a/work/Spigot b/work/Spigot index a2190e302d..41150f3919 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit a2190e302dde05a08e245990d97fb09184815583 +Subproject commit 41150f3919a43f833c5c81734afc71ad419c6816