diff --git a/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/unapplied/api/0004-Add-FastUtil-to-Bukkit.patch index af4e597708..0e905b3b3b 100644 --- a/patches/unapplied/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 364b6215d2facb0273a67ff605ccb8e707e080b8..3777d12874ede329410a6bf1c0533deb44924d73 100644 +index e49f4853e36f493754841231eeb5dd093b3788e0..98afa6a25131dc626ea7a5122f33df6bd2d39178 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,6 +19,7 @@ dependencies { diff --git a/patches/unapplied/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch index b8a5de586b..26bd9c9e32 100644 --- a/patches/unapplied/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/unapplied/api/0008-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b1d770a62e499d909de4352303409fcfdc5d58a9..fc7d17fd3028f790ff9e034e8234bf0506f017c2 100644 +index 35de49ea52b507dd925ed3c118518a335035a710..5c6b7f5095a5bb7290e1edefb0c9e985123f80d8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -75,6 +75,20 @@ public final class Bukkit { @@ -32,7 +32,7 @@ index b1d770a62e499d909de4352303409fcfdc5d58a9..fc7d17fd3028f790ff9e034e8234bf05 * Attempts to set the {@link Server} singleton. *

diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 465a7f5312a5d5b65f7366f476b7c42795f53105..dd79325a8f52190c44b833870043d167641211a6 100644 +index bbb4eb3c4e46ade7dd939c2b0e4436161d6f8a1e..1dedbea03e259679e101a8443b662b20375adfd0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -60,6 +60,18 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/unapplied/api/0011-Version-Command-2.0.patch b/patches/unapplied/api/0011-Version-Command-2.0.patch index 0884b58570..9d62aa925d 100644 --- a/patches/unapplied/api/0011-Version-Command-2.0.patch +++ b/patches/unapplied/api/0011-Version-Command-2.0.patch @@ -56,7 +56,7 @@ index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c7 + } +} diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index ce5794d684a1126ec9acbf4af17f5d6fa783f551..5ba6c7a69937badd64256248560268fb695d5f74 100644 +index c9ecd5b1908e05a1b39dadcded27241672adcddf..355c46f1c1f08072446f3cc92c0d22898933a7fc 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -94,5 +94,12 @@ public interface UnsafeValues { diff --git a/patches/unapplied/api/0026-Use-ASM-for-event-executors.patch b/patches/unapplied/api/0026-Use-ASM-for-event-executors.patch index 4851ec4874..9b6e46aab1 100644 --- a/patches/unapplied/api/0026-Use-ASM-for-event-executors.patch +++ b/patches/unapplied/api/0026-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index 19b65a9b56b73f873ef646d14a6cf091b69d3873..bc6f68a0cadeec865401e9cb0dce89460484b148 100644 +index eefc024acc3e14ae21855df7f2f358bd1e0a9e38..da7aa34850b39500f89f01a2969d3a1a5a80f80f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,9 @@ dependencies { diff --git a/patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch index 502ccafbb0..11a0e7623c 100644 --- a/patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/patches/unapplied/api/0053-Add-configuration-option-to-prevent-player-names-fro.patch @@ -46,7 +46,7 @@ index 9c1cd95e125b1d7677daea1575a466a1b955053a..acd69a5d946974e0b50439a987127506 + // Paper end } diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index c4dcafac892169a7bfcc065701fffb43c6cfdf44..b1152f4dede61383232cc6713d448840612eac13 100644 +index 8d7a61b711cec7eff0e71b9ae942f3050196d955..fc5e398adc8f24187f1ffc0c4b3b429e3c6b25eb 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -99,7 +99,7 @@ public abstract class Command { diff --git a/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch index 4f28c52220..aca22014e0 100644 --- a/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/unapplied/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index bc6f68a0cadeec865401e9cb0dce89460484b148..d6c4abc30af2b535644707a240b60d1b613785e9 100644 +index da7aa34850b39500f89f01a2969d3a1a5a80f80f..01798255d45f2a642df00156f11dd2bcd8108079 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,8 @@ dependencies { diff --git a/patches/unapplied/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 index 958596ad70..bd9484dd8a 100644 --- a/patches/unapplied/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 @@ -87,7 +87,7 @@ index f99d60ae4003f953b5680a997e9e43e63c035b0c..c943bd801b54519ba6cf5d45aec593d7 /** diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 657243776c8a2abb5a57e5c407212a8387d649eb..4fa5f7140ea97e1b6a63808b59115bfb1a85cb32 100644 +index 24e3eaa008e53af8d77439e4f2ab9007285d7826..684d7b1105350660fe7fc66f57a49db7f39610b4 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -44,6 +44,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot diff --git a/patches/unapplied/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 index b120809756..41c8e70b83 100644 --- a/patches/unapplied/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 @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index ce1e1e6cc6740d568fbf859c7e2c014fab5a59cd..62ab55729e69bfac8eb4b40d877b945d95df27cd 100644 +index b4094e042c1619cfcdd68c27f82979a7562ddf55..d29bdc125dba0128d93d57e8d9393b970e6c00a9 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -271,6 +271,16 @@ public interface Block extends Metadatable { diff --git a/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch index 59e686d430..34c3a73486 100644 --- a/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/unapplied/api/0076-Expose-client-protocol-version-and-virtual-host.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f32eaa35d9152564300455a24c811e15d3ab694f..204c337558e84304de4f511473be8cccb2a8cd4f 100644 +index 9d23a4019814f4662f4ab9a47b3fceff656c5245..f9f708bda24751353dd61951418731a2eea5abb0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index eef7cb2fc8..178267a089 100644 --- a/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/patches/unapplied/api/0089-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 31f6f781a0403bf6388d668f0effaed5aae94468..25e0d571710403c334bd73ce1b97109dd65c3244 100644 +index c7c45e2de8cca1bf8b8e12752e08db62403efa6a..c30b44ff26f8f253902754452a0816f07c7fd035 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -2,6 +2,9 @@ package org.bukkit.event.player; diff --git a/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch b/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch index 6fabe353b6..0282cabb0c 100644 --- a/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch +++ b/patches/unapplied/api/0098-Additional-world.getNearbyEntities-API-s.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's Provides more methods to get nearby entities, and filter by types and predicates diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 8a2ca11be9ebde91268b20d25a35e1d6842f49de..e6d6283f3dd76b6c5af34374a05a5ab966419d06 100644 +index 9adbc26b78e64188fc5b3f00980d310f817b43bc..1e171fe09eab0487f039a51c36021fb9df0302c9 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,9 @@ @@ -277,7 +277,7 @@ index 8a2ca11be9ebde91268b20d25a35e1d6842f49de..e6d6283f3dd76b6c5af34374a05a5ab9 * Get a list of all players in this World * diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 25e0d571710403c334bd73ce1b97109dd65c3244..033960f566861e303b9cb61aae4c02add501d93f 100644 +index c30b44ff26f8f253902754452a0816f07c7fd035..9acf1fb404ccf9b3bc06a448c3099ca2e838facf 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event { diff --git a/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch index ffe2ae18db..8165c5e87d 100644 --- a/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/unapplied/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -522,7 +522,7 @@ index 8d048a8f1446f862dcc61952971b54bab9bb2ac3..60a70b9e7a613e64a31a127264f17485 * Options which can be applied to redstone dust particles - a particle * color and size. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e6d6283f3dd76b6c5af34374a05a5ab966419d06..d4c55682f6b2433808a2f0542189a5672d4991ea 100644 +index 1e171fe09eab0487f039a51c36021fb9df0302c9..5c01bd7c97a52a172c95de43570b97bc2a5ffa35 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2784,7 +2784,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0115-Expand-Explosions-API.patch b/patches/unapplied/api/0115-Expand-Explosions-API.patch index 2cd39a41dd..9ccb381e50 100644 --- a/patches/unapplied/api/0115-Expand-Explosions-API.patch +++ b/patches/unapplied/api/0115-Expand-Explosions-API.patch @@ -106,7 +106,7 @@ index bbc636baef2e2b0586c7d517be428438ca26ab66..a8d4f7972d07ddde171b4a1ec470a4c6 * Returns a list of entities within a bounding box centered around a Location. * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index d4c55682f6b2433808a2f0542189a5672d4991ea..68b10c8643e9c2c873e627b2185f983a9c1023aa 100644 +index 5c01bd7c97a52a172c95de43570b97bc2a5ffa35..3bb24a54df61b9c3b44c9013b156385ae5f650fa 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1421,6 +1421,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch b/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch index a26057b694..c39c988e3b 100644 --- a/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch +++ b/patches/unapplied/api/0119-Add-World.getEntity-UUID-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 68b10c8643e9c2c873e627b2185f983a9c1023aa..057b7ace5428d2799d33d91097f6cec786c7bd58 100644 +index 3bb24a54df61b9c3b44c9013b156385ae5f650fa..c51f086057b8265ff044dce89442c6ffff901e43 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -941,6 +941,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch index 44a1af109d..c0e8088e9f 100644 --- a/patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch +++ b/patches/unapplied/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch @@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which plugins have and haven't been updated. diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 5ba6c7a69937badd64256248560268fb695d5f74..db272568d7dee924083e37c55bdbf90f05fafc69 100644 +index 355c46f1c1f08072446f3cc92c0d22898933a7fc..cbf7df30a7ec8445c8492e3b9f108747dbe1717b 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -101,5 +101,11 @@ public interface UnsafeValues { diff --git a/patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch index 4941f006c9..ac3c5b21cf 100644 --- a/patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/patches/unapplied/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -44,7 +44,7 @@ index 06737962b844275a74ee2407cc09918599cbaea4..1a4b6922c0a881b60ddf305b1e2b3af0 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 057b7ace5428d2799d33d91097f6cec786c7bd58..ee277a464b1ecaaa7948c333a04e347e6255c904 100644 +index c51f086057b8265ff044dce89442c6ffff901e43..400109746016767be364ae2f2e51505f1cbb4287 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -209,6 +209,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch index a515c39dc2..8e9dc7b0a4 100644 --- a/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/patches/unapplied/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -50,7 +50,7 @@ index 36ed248f0716f2cc465c08ab851b7d83d4c7c0a7..5c5e05673e0912f4dbd6c728f4c3b7fc * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index a501384906fa01ddc83476ef2dbbb8d11a03fb8c..449d6882c8f41d9e0f46436c430e071b85eb2775 100644 +index 400109746016767be364ae2f2e51505f1cbb4287..3111b4706bf3d8bbe7b96268d5450a96455c659c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -92,6 +92,40 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0144-isChunkGenerated-API.patch b/patches/unapplied/api/0144-isChunkGenerated-API.patch index 82949cb142..8a6328b086 100644 --- a/patches/unapplied/api/0144-isChunkGenerated-API.patch +++ b/patches/unapplied/api/0144-isChunkGenerated-API.patch @@ -34,7 +34,7 @@ index 5c5e05673e0912f4dbd6c728f4c3b7fcdae8f0e8..57cb548683f7b2972c998afd34176952 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 449d6882c8f41d9e0f46436c430e071b85eb2775..dcca66c345b3c51d7b9956ddd3ac2bf0b789899c 100644 +index 3111b4706bf3d8bbe7b96268d5450a96455c659c..e775645a12c7102d9f4b5bcb55556df87e2fad75 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -257,6 +257,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0146-Async-Chunks-API.patch b/patches/unapplied/api/0146-Async-Chunks-API.patch index 69883d608d..7e8fcf2055 100644 --- a/patches/unapplied/api/0146-Async-Chunks-API.patch +++ b/patches/unapplied/api/0146-Async-Chunks-API.patch @@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index dcca66c345b3c51d7b9956ddd3ac2bf0b789899c..04583189f7ed9a446ed649780e2b99cb5e1ab3ad 100644 +index e775645a12c7102d9f4b5bcb55556df87e2fad75..284f79085f96f4044a92c37932c21c5dd7b50d0d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -966,6 +966,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0149-Improve-death-events.patch b/patches/unapplied/api/0149-Improve-death-events.patch index de70d5fff4..7cad311ede 100644 --- a/patches/unapplied/api/0149-Improve-death-events.patch +++ b/patches/unapplied/api/0149-Improve-death-events.patch @@ -180,7 +180,7 @@ index a5984ab06cce95d30e70511e125f69339b574c04..e19a3df9aa2204b44c0b029bda141ae6 + // Paper end } diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index a01d4c21bedc7f1a54f5a330bb4c2909ce3a18e4..48f272747b8d5ab43f79a9d474713aca79f121b7 100644 +index 7941c60b0e1840785ba2b250071591bd75bc6e35..a871eddf73f918c0e3d2554ef8d9cfd0f830fcaa 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -63,6 +63,17 @@ public class PlayerDeathEvent extends EntityDeathEvent { diff --git a/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 53ea3ea9dc..56ad8fa03c 100644 --- a/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/patches/unapplied/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -226,7 +226,7 @@ index c65f0d6569c130b4920a9e71ad24af6427f1f030..01bcb3a1bdb5accdf844d0178cec3d25 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 69f68ca2d62c2cfe07a193776054c14c352a5942..45baebc97f0aec8abc9a894bc135e4767d7c9e35 100644 +index a19635c38705e6221ae25d58e976e483e7ed17e4..71c7780424a986a95852b1ca15116096896500df 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -444,4 +444,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste diff --git a/patches/unapplied/api/0156-Add-Material-Tags.patch b/patches/unapplied/api/0156-Add-Material-Tags.patch index 703b063034..2e3b2e5505 100644 --- a/patches/unapplied/api/0156-Add-Material-Tags.patch +++ b/patches/unapplied/api/0156-Add-Material-Tags.patch @@ -1067,7 +1067,7 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5 + .ensureSize("WATER_BASED", 11).lock(); +} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 5a25301a81b0e88a4891cbc4710289544d44105c..34d23f53acf00620223731c4fdacffde9cff41a8 100644 +index 107d12d447be481928ee796f73b7acb2c4b9b2d8..42d0f31c2be2d39c4481f98c0756c4f1ae337717 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/unapplied/api/0159-Add-sun-related-API.patch b/patches/unapplied/api/0159-Add-sun-related-API.patch index 63eae12250..dff8d369c1 100644 --- a/patches/unapplied/api/0159-Add-sun-related-API.patch +++ b/patches/unapplied/api/0159-Add-sun-related-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 04583189f7ed9a446ed649780e2b99cb5e1ab3ad..f36eb8896ee84c1d3bbce17b11ed05c5f99f2e29 100644 +index 284f79085f96f4044a92c37932c21c5dd7b50d0d..b4c77e92f286e0159c8f25a063a964aaf1b1bd8c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1793,6 +1793,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch b/patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch index 0800740be4..1997329bfa 100644 --- a/patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch +++ b/patches/unapplied/api/0163-Make-the-default-permission-message-configurable.patch @@ -43,7 +43,7 @@ index 2042f4963c53d5a903f0de1fec6a9af3a7b2bba4..b8ed8d5d48cb4f1b2f598e2c48e4423a * Creates a PlayerProfile for the specified uuid, with name as null. * diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index d039f722ab9f08bc485b581832b50830c7145c2d..97dc60444746c37c44ff5c8056f4fed04a944714 100644 +index fc5e398adc8f24187f1ffc0c4b3b429e3c6b25eb..4c608818a797c12cba6aa91643a915cf0bae77f5 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -184,10 +184,9 @@ public abstract class Command { diff --git a/patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch b/patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch index 99778b2c8d..78cd04e329 100644 --- a/patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch +++ b/patches/unapplied/api/0175-Fix-Spigot-annotation-mistakes.patch @@ -428,7 +428,7 @@ index 5408a8c123942a56ef11597ae6cdb77e14f741e3..29bb84145be18ef9162abdfc8820f2b3 public class PlayerShowEntityEvent extends PlayerEvent { diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java -index d14d3851a7b0340668f44f5213f0e18072d7481b..eff4c1cb410e032ee287084cb51b59fd9f84df8d 100644 +index 4c9a64ace0d0f9f83d31ea75dabdf4666d48461a..e70e6949a9d5a5a37f0c92e139071d4060548e96 100644 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java @@ -515,7 +515,9 @@ public abstract class ChunkGenerator { @@ -717,7 +717,7 @@ index 7f6d3c71c5b3a9aa54c84a4c3b7c3614a0d477ce..1bab04b44d99c974b1cc099d127b93df return removeIngredient(count, ingredient.getItemType(), ingredient.getData()); } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 45baebc97f0aec8abc9a894bc135e4767d7c9e35..a761b8369e1f78b28146b0a4cce121e507d4a738 100644 +index 71c7780424a986a95852b1ca15116096896500df..5428aeb018c415f8e9bb46c84a627adf70829259 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -74,8 +74,10 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste diff --git a/patches/unapplied/api/0178-Add-Heightmap-API.patch b/patches/unapplied/api/0178-Add-Heightmap-API.patch index 6843d391b4..60502f4043 100644 --- a/patches/unapplied/api/0178-Add-Heightmap-API.patch +++ b/patches/unapplied/api/0178-Add-Heightmap-API.patch @@ -103,7 +103,7 @@ index d4c87bfed81b2d73919705912f59fab05c0ee61b..ef0cb00ca4cb7d2f5e4ec1c950cce036 * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index f36eb8896ee84c1d3bbce17b11ed05c5f99f2e29..23fd3f85288ef1fbfb104df7a636ad69042704a7 100644 +index 4f9f8e51e1a99a2d19643d105b839562ebe0b600..f463450c35e6fbba95c57a3a27192b667cb9e093 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -164,6 +164,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/unapplied/api/0183-Expose-the-internal-current-tick.patch b/patches/unapplied/api/0183-Expose-the-internal-current-tick.patch index 921bf16dcf..f607ec8ee0 100644 --- a/patches/unapplied/api/0183-Expose-the-internal-current-tick.patch +++ b/patches/unapplied/api/0183-Expose-the-internal-current-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b4256e2c66e3f578a4499dc1fff50f213898b96b..6a2cf46d54ae6c93e95e78c5fa98e6aef48c168f 100644 +index d9f245ec7998655116c485b5607a130cb443765e..f6a862fcf269865eacc67088833bfdd09b661654 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2196,6 +2196,10 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch index f10b186731..0561046520 100644 --- a/patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/unapplied/api/0184-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 61d12cb8f0a924abf696b6da7258f34dbb7b51b6..8175e5329f7fb6da4c7faf695162b51492114dc3 100644 +index 5f7d0d08be8bca06c9aa89659b7865a7b5a547f8..9d95218b49895ab76b00fe9524d9b25ea9f9b8c2 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -1,6 +1,8 @@ diff --git a/patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch b/patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch index f45d2dfebc..81c136c000 100644 --- a/patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch +++ b/patches/unapplied/api/0185-Add-effect-to-block-break-naturally.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add effect to block break naturally diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 7ea765d5d653b1b84e73fd8c4d9d923049bd06ff..c88c4223928c2e47f1a85b73165cf433806677df 100644 +index db441e463b02ee734f85c855f5538cd41041dbae..1e7ee68e56f8d4399c2cbf26aa45bf8b599b3b02 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -480,6 +480,26 @@ public interface Block extends Metadatable { diff --git a/patches/unapplied/api/0189-Add-tick-times-API.patch b/patches/unapplied/api/0189-Add-tick-times-API.patch index 38427aaaba..9bc09be7f9 100644 --- a/patches/unapplied/api/0189-Add-tick-times-API.patch +++ b/patches/unapplied/api/0189-Add-tick-times-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6a2cf46d54ae6c93e95e78c5fa98e6aef48c168f..c1e1a311ea5fb4826f6b400b098262e177e22318 100644 +index f6a862fcf269865eacc67088833bfdd09b661654..3fb45f03f3901de5592e2bb6ba8f75b5fd474509 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1898,6 +1898,25 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0190-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/api/0190-Expose-MinecraftServer-isRunning.patch index c041029a38..e630be40ce 100644 --- a/patches/unapplied/api/0190-Expose-MinecraftServer-isRunning.patch +++ b/patches/unapplied/api/0190-Expose-MinecraftServer-isRunning.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c1e1a311ea5fb4826f6b400b098262e177e22318..96f1619a188d569398bbc2bb8ff0b4bd8f08f825 100644 +index 3fb45f03f3901de5592e2bb6ba8f75b5fd474509..5d5f1e52f2ff19a48776a4fdbd026d67e538bec9 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2219,6 +2219,15 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch index 6ad9f0341f..5a229d8dad 100644 --- a/patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch +++ b/patches/unapplied/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization Serializes using NBT which is safer for server data migrations than bukkits format. diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index db272568d7dee924083e37c55bdbf90f05fafc69..f9434c19c1bf355a734b3a1ddf32c81fb7abf9eb 100644 +index cbf7df30a7ec8445c8492e3b9f108747dbe1717b..1b5f36b78d81b688ded88ab91e36d9df8c5d64ee 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -107,5 +107,9 @@ public interface UnsafeValues { diff --git a/patches/unapplied/api/0199-Expose-game-version.patch b/patches/unapplied/api/0199-Expose-game-version.patch index b1987afc00..a30e1009ba 100644 --- a/patches/unapplied/api/0199-Expose-game-version.patch +++ b/patches/unapplied/api/0199-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 13d8d2d955ada2765b6c6773f77a5407c86cc390..9bcde6496876bf184654c829e73b730b2e70bba6 100644 +index 5d5f1e52f2ff19a48776a4fdbd026d67e538bec9..8a782b8b65a9a99318ed1a1f1e8631197d0e5eeb 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -135,6 +135,18 @@ public final class Bukkit { @@ -28,7 +28,7 @@ index 13d8d2d955ada2765b6c6773f77a5407c86cc390..9bcde6496876bf184654c829e73b730b * Gets a view of all currently logged in players. This {@linkplain * Collections#unmodifiableCollection(Collection) view} is a reused diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 5cd3a9a6066b01525c0d3a54e852e876535f37d3..5cd733705f47f9fc77d1b10065d93a9b0356f5ea 100644 +index d59a7e0c9ec50040fb0b2cc3239cae46760aba04..9b2c1eb7e215a9227c60bc85906fed33ec1dd60a 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -112,6 +112,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/unapplied/api/0200-Add-Mob-Goal-API.patch b/patches/unapplied/api/0200-Add-Mob-Goal-API.patch index 1328640819..87bd25ccaa 100644 --- a/patches/unapplied/api/0200-Add-Mob-Goal-API.patch +++ b/patches/unapplied/api/0200-Add-Mob-Goal-API.patch @@ -523,7 +523,7 @@ index 0000000000000000000000000000000000000000..8fd399f791b45eb7fc62693ca954eea0 + @Deprecated GoalKey UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset")); +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 08ac59d4f0935a79323ff34eb585b8a5b5a072b4..21b026aa0f53cf2608b64f9603185562cd237d2d 100644 +index 8a782b8b65a9a99318ed1a1f1e8631197d0e5eeb..43674a3fb8b0b1dc4bef13ecaf83f68f06b29ec1 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2240,6 +2240,16 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0209-Support-components-in-ItemMeta.patch b/patches/unapplied/api/0209-Support-components-in-ItemMeta.patch index 1d7063a0ed..d9bc5b4ade 100644 --- a/patches/unapplied/api/0209-Support-components-in-ItemMeta.patch +++ b/patches/unapplied/api/0209-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 8c48a5c61b5afb5407ebf5d734858a0177e3ffa1..77f52b117dec8b99a507995a587505229eadb89e 100644 +index 5428aeb018c415f8e9bb46c84a627adf70829259..f1e9a7626c4efb99be78f1056dc04b06bbe13c87 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -5,6 +5,7 @@ import java.util.Collection; diff --git a/patches/unapplied/api/0214-Add-setMaxPlayers-API.patch b/patches/unapplied/api/0214-Add-setMaxPlayers-API.patch index 06fe9fac72..c9d0796fad 100644 --- a/patches/unapplied/api/0214-Add-setMaxPlayers-API.patch +++ b/patches/unapplied/api/0214-Add-setMaxPlayers-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d9581a6270df9e3507cf60a9049ef59e7ff464af..cf453476006563d8f9c165809c89d73089a84acc 100644 +index 43674a3fb8b0b1dc4bef13ecaf83f68f06b29ec1..4eafa8f3342648d0b58642102d6c75a8a79c9764 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -188,6 +188,17 @@ public final class Bukkit { @@ -27,7 +27,7 @@ index d9581a6270df9e3507cf60a9049ef59e7ff464af..cf453476006563d8f9c165809c89d730 * Get the game port that the server runs on. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b78ccbf832199fe84b351c7467a3d9be39f2f819..8f6878d2b6a43ec90f5011df6530083bdf6166cb 100644 +index c11d802408c793c6410118bd281a21e59394066f..a7ba813396fab77bed292422f881b5a0952972fb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -159,6 +159,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/unapplied/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 4ea9810449..e88d196cc0 100644 --- a/patches/unapplied/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/unapplied/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 580e73c3fc0e647ad128ab7d845c15fbe80484a3..b24439b379be1a90dde4e6f4dbe5ca3fdd8face4 100644 +index e10edf17a87d18e9d9a22c6793d6ac78054d841b..035dfcd9d483152a050e45409f15b015b135fb38 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -140,5 +140,12 @@ public interface UnsafeValues { diff --git a/patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch index 7ec8fffe49..4f32a4a520 100644 --- a/patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/unapplied/api/0228-Add-getOfflinePlayerIfCached-String.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f9fdb1882a283e47604136a27d1c95266b988a37..8072924c977e0a23ee743ca8d613b9ea5de885fa 100644 +index 4eafa8f3342648d0b58642102d6c75a8a79c9764..37a295b2bbf7127713e19f224e788e0adb8823f4 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1188,6 +1188,27 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0233-Add-Destroy-Speed-API.patch b/patches/unapplied/api/0233-Add-Destroy-Speed-API.patch index 1d65ef7851..dbca343b9b 100644 --- a/patches/unapplied/api/0233-Add-Destroy-Speed-API.patch +++ b/patches/unapplied/api/0233-Add-Destroy-Speed-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API Co-authored-by: Jake Potrebic diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 3f1c58e813afe90eaf467e0b76949ed8df752939..68a91de4ab068fd32dc883a9427475c07218941e 100644 +index 2c837ea822f3b0c4ec312f0c956fe1b778cbd5e9..4a408361ac86b8c490942686c2709817338f4f59 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -656,5 +656,29 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran diff --git a/patches/unapplied/api/0244-Additional-Block-Material-API-s.patch b/patches/unapplied/api/0244-Additional-Block-Material-API-s.patch index 11728abea8..fe8d819d32 100644 --- a/patches/unapplied/api/0244-Additional-Block-Material-API-s.patch +++ b/patches/unapplied/api/0244-Additional-Block-Material-API-s.patch @@ -9,7 +9,7 @@ process to do this in the Bukkit API Adds API for buildable, replaceable, burnable too. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 839867cd0a92fc0ea2b9ea009b67a841f8c7edd6..bcf3dc1bc640dc270446db0e1da081272d3933f1 100644 +index 4a408361ac86b8c490942686c2709817338f4f59..43a0e57a6db702b2a40e151f151bfaa63b9d95d5 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -438,6 +438,42 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran diff --git a/patches/unapplied/api/0256-Add-PaperRegistry.patch b/patches/unapplied/api/0256-Add-PaperRegistry.patch index 4cda0a858c..1a1ca3cc24 100644 --- a/patches/unapplied/api/0256-Add-PaperRegistry.patch +++ b/patches/unapplied/api/0256-Add-PaperRegistry.patch @@ -91,7 +91,7 @@ index 0000000000000000000000000000000000000000..f29e76a6b66ddfec12ddf8db6dcb2df6 + } +} diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index b24439b379be1a90dde4e6f4dbe5ca3fdd8face4..0697214210a6e87f690b9454d9651d06ca57a524 100644 +index 035dfcd9d483152a050e45409f15b015b135fb38..abe79e4a2233341d0030742b823a0cfb5af97f41 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -147,5 +147,15 @@ public interface UnsafeValues { diff --git a/patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch index e7986f5bb1..ae5787045f 100644 --- a/patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch +++ b/patches/unapplied/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index 664de64b020cf9090a2fbee0afe2bfaf150adc3c..b06995aa57aa9cba0bb59f1d26d81015619a08e6 100644 +index a4e3d526db2d17dc923cbe82e53d3c902d61e1f3..2448e70d75ae7a678c6befac4506c103edb78875 100644 --- a/src/main/java/org/bukkit/inventory/InventoryView.java +++ b/src/main/java/org/bukkit/inventory/InventoryView.java @@ -450,7 +450,7 @@ public abstract class InventoryView { diff --git a/patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch b/patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch index a2f517e8be..61808599bf 100644 --- a/patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch +++ b/patches/unapplied/api/0271-Cache-the-result-of-Material-isBlock.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache the result of Material#isBlock diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 733223b0b0a1490afd0957957798e010a2373216..9e6380ed86b11cc763afa02ddaf124ee98e24797 100644 +index f2ca0a11f0d7f8c48f7464045eded5486c1128af..b93f0af3a06ee4fb00964066e1b6d1d13dfec5c3 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -3932,6 +3932,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata diff --git a/patches/unapplied/api/0275-Add-Block-isValidTool.patch b/patches/unapplied/api/0275-Add-Block-isValidTool.patch index 50dd2f43cb..1ba9ed8d9a 100644 --- a/patches/unapplied/api/0275-Add-Block-isValidTool.patch +++ b/patches/unapplied/api/0275-Add-Block-isValidTool.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index bcf3dc1bc640dc270446db0e1da081272d3933f1..cff83028e9a08466551db4698cf4860553dd750d 100644 +index 43a0e57a6db702b2a40e151f151bfaa63b9d95d5..c847bc83c0911007d226f1a8c6f1d0cefa9a1689 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -229,6 +229,15 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran diff --git a/patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch index 1cdb558cbc..c42542a195 100644 --- a/patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch +++ b/patches/unapplied/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java -index ac9e606b85e0715b7e1b331a987c0ee34ee541ff..7b21e913a3ac9beb5dab91f11b1a0aa62e33ad36 100644 +index 42f76751ec414648ee719c341d471d947bf85be6..58d52f6e1660ebdb098566a2ae6b50c8b44dc0d9 100644 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java @@ -513,4 +513,32 @@ public interface EntityEquipment { diff --git a/patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch index 655cc86658..bf487b87b1 100644 --- a/patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch +++ b/patches/unapplied/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 033960f566861e303b9cb61aae4c02add501d93f..694a81769076ea58aae9f14f076ab80c9952c957 100644 +index 9acf1fb404ccf9b3bc06a448c3099ca2e838facf..baee5038ec7c3e190a328016d9ab290ae48badf6 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -20,6 +20,7 @@ public class AsyncPlayerPreLoginEvent extends Event { diff --git a/patches/unapplied/api/0295-Add-basic-Datapack-API.patch b/patches/unapplied/api/0295-Add-basic-Datapack-API.patch index 6d61743118..ea77570d05 100644 --- a/patches/unapplied/api/0295-Add-basic-Datapack-API.patch +++ b/patches/unapplied/api/0295-Add-basic-Datapack-API.patch @@ -70,7 +70,7 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7 + +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c7fe6865e1a14116b61ae69c26d4af2d8af11955..64fc7215eb93b50173ed716c1dde1a151a0edf6e 100644 +index 3a2137c6505ef0e14875f7eaa7809509750fb625..5da1155557c6a662632717ac55d546dd91dee3fa 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2294,6 +2294,14 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch b/patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch index ef7aa8edda..8a9957d482 100644 --- a/patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch +++ b/patches/unapplied/api/0313-Add-Git-information-to-version-command-on-startup.patch @@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 7732d26277ca8b845898cb01c7623a2f175f0aaa..2af2a948dc9c0d4ad28fccb1c9a2b28d5db99203 100644 +index 5da1155557c6a662632717ac55d546dd91dee3fa..3e3e48f467eef561eeada98c6b99388e23595d7f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -53,6 +53,7 @@ import org.bukkit.util.CachedServerIcon; diff --git a/patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch index d71e8a9daf..422f59252e 100644 --- a/patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/unapplied/api/0340-Add-Raw-Byte-Entity-Serialization.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 54b0fe21d3b6379e6550a3b1dc81c2a44e7699da..b39d1474210da1974d7e95f10daaf496a9330442 100644 +index be8d5c172b0a300648f21e2163ccf0a9cd7915ee..4fcafddf3792b66c618f91e04d102f374de565a8 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -112,6 +112,14 @@ public interface UnsafeValues { diff --git a/patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch index fd0c6844c5..7efbd37783 100644 --- a/patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/unapplied/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 746e988f67e1d3218556e52ad70a4f5133d1bc1e..6f9ffbb907b7f14ae2cfc3cae45ea277c00d461c 100644 +index 3e3e48f467eef561eeada98c6b99388e23595d7f..32d346fb12c976253a3731df6613983f01a9ebb5 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1861,6 +1861,24 @@ public final class Bukkit { @@ -61,7 +61,7 @@ index 2409c0023f90689399c8ceba179b800156d16eea..64e4667efbf60204076ef32d64aa3a76 * Creates a boss bar instance to display to players. The progress * defaults to 1.0 diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java -index eff4c1cb410e032ee287084cb51b59fd9f84df8d..7c24e9d207bad6eff6793e2348fd34a462a49e5d 100644 +index e70e6949a9d5a5a37f0c92e139071d4060548e96..ef756dcd55146af71649658eadc45b70d3ba057f 100644 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java @@ -454,6 +454,22 @@ public abstract class ChunkGenerator { diff --git a/patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch index c56c240b80..3f005c4a38 100644 --- a/patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch +++ b/patches/unapplied/api/0356-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 694a81769076ea58aae9f14f076ab80c9952c957..356d1154b0732e2daf242d60fa715dba9f2dc9db 100644 +index baee5038ec7c3e190a328016d9ab290ae48badf6..635b8787fc235b61c0d5677def034656e4ec4cef 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -22,6 +22,7 @@ public class AsyncPlayerPreLoginEvent extends Event { diff --git a/patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch index e83a3dfc5d..629486a185 100644 --- a/patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/unapplied/api/0364-API-for-creating-command-sender-which-forwards-feedb.patch @@ -5,7 +5,7 @@ Subject: [PATCH] API for creating command sender which forwards feedback diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6f9ffbb907b7f14ae2cfc3cae45ea277c00d461c..9a7a2ad3d245b5215b914ef1a00fb65a83639871 100644 +index 32d346fb12c976253a3731df6613983f01a9ebb5..7fcb2d84e707576531ddb9a7dd85cf0481ae58ce 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1392,6 +1392,20 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0371-Custom-Potion-Mixes.patch b/patches/unapplied/api/0371-Custom-Potion-Mixes.patch index a377d29a9e..e0f50d8678 100644 --- a/patches/unapplied/api/0371-Custom-Potion-Mixes.patch +++ b/patches/unapplied/api/0371-Custom-Potion-Mixes.patch @@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..cb6d93526b637946aec311bef103ad30 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 9a7a2ad3d245b5215b914ef1a00fb65a83639871..d8666481f9a407403d0114ff02024fd3c50c27c4 100644 +index 7fcb2d84e707576531ddb9a7dd85cf0481ae58ce..a87399fa4838d4b2c1ff9cc35d433ae76cc149bf 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2353,6 +2353,15 @@ public final class Bukkit { diff --git a/patches/unapplied/api/0374-Add-getComputedBiome-API.patch b/patches/unapplied/api/0374-Add-getComputedBiome-API.patch index d7453242e1..b192af7101 100644 --- a/patches/unapplied/api/0374-Add-getComputedBiome-API.patch +++ b/patches/unapplied/api/0374-Add-getComputedBiome-API.patch @@ -51,7 +51,7 @@ index 43b53c21af01e0f496c8aaacff82dfdfadaf40f6..3f7e860de4e28745fcdf8d2f41f4a8c2 * Sets the {@link Biome} at the given {@link Location}. * diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 3e980c630452c8ea72227bc4cd92c605253cd41b..f95b7a60dd6f3ed25f84296f249eb0776855d255 100644 +index cff39708e66208921da15d12d94407d6b6950298..e405c279f6135c94c775a856ab88fd3cace6bd5c 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -370,10 +370,22 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran diff --git a/patches/unapplied/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch index 1a29bd5285..72fee8c2e0 100644 --- a/patches/unapplied/server/0002-Remap-fixes.patch +++ b/patches/unapplied/server/0002-Remap-fixes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remap fixes diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 885445d353b7abc87f4ff863da357dfe480d9ada..8aecabe25510a58041194b0b798236bd652991dc 100644 +index cdd5d95326c663c1c493c45a28918a12ac6b449f..5311c40d9bf22b423a69bc722a6125493e616eac 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -270,9 +270,11 @@ public class BlockPos extends Vec3i { diff --git a/patches/unapplied/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch index 865049b0e4..0b8ff48e40 100644 --- a/patches/unapplied/server/0003-Build-system-changes.patch +++ b/patches/unapplied/server/0003-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 75c858870a55f7282a0e3500f803cb330b462f37..d39ed9a8a32913193aec1bba2a59a352b8032dae 100644 +index 3167619a2466fe1d3678828437b7eb17bb78ecce..9af9165b900d18baffb736b7105409210717ccef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,10 +9,9 @@ plugins { diff --git a/patches/unapplied/server/0007-MC-Utils.patch b/patches/unapplied/server/0007-MC-Utils.patch index fa3e4e1f3f..95806ea935 100644 --- a/patches/unapplied/server/0007-MC-Utils.patch +++ b/patches/unapplied/server/0007-MC-Utils.patch @@ -6126,7 +6126,7 @@ index 7e4e947f2be4d5ef0f6f1b3eb10a5b8d5018e918..e99f7f5eae48e635f167744394ce559e public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 197a27274c9277c41bb7fcda34afa7ef652e1a9b..c94c62e7e32f55d322ddfed930e1aaa6c1343b29 100644 +index 2f5bd8d2dd2f185c8d1d397a6bd83b46071cc6f3..c2b768c949cbf8d5e1db5a99812eb31c47194e0e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -258,6 +258,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/unapplied/server/0012-Timings-v2.patch b/patches/unapplied/server/0012-Timings-v2.patch index bf5e41f721..f5ca2ae821 100644 --- a/patches/unapplied/server/0012-Timings-v2.patch +++ b/patches/unapplied/server/0012-Timings-v2.patch @@ -1327,7 +1327,7 @@ index de0f49f3e9134c068aa479067ee2986c981167b8..0750cf27c1b2cac723d68d0e6c2204cb 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 7d624f741291cad59545e465db9c46e56581ed8a..628ae2171c42d04b418001bf542e25ebe12bb18e 100644 +index 9dd29a669a10735819d3be03e4693850de58bb28..96c59b0e5ac3d36c8ecd513b64723e7dbe5d9b3a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -210,6 +210,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1707,7 +1707,7 @@ index 95abf42577725383a2b49242c28b81beef487ee5..4e5cfc508e356691a9a249013553f97e }; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e2270d75c1ffaf0b68300f0734987e86ab6fedda..4a04536ecdeb055fd32272884f6057e5d04f1035 100644 +index 81e78644417764cee33f81cdb116a91fb1d8ccf3..a40995140db011271bd092b0b7415d1eee0e8b18 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2361,12 +2361,31 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch index 0657f70afc..5b51677c1e 100644 --- a/patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/unapplied/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4a04536ecdeb055fd32272884f6057e5d04f1035..9a0765ea17bd8ba36427a84caf7594d010bfdf1a 100644 +index a40995140db011271bd092b0b7415d1eee0e8b18..a9f3bddd33cf7f7773c262f1b818eed9895987ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -399,10 +399,15 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 91b78febe9..85459fbbb3 100644 --- a/patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/unapplied/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -32,7 +32,7 @@ index f1c94ec44233ce0007a43922d1ca7ba5e71d68bd..eef07309b24e88820d35517dd868fff2 public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9a0765ea17bd8ba36427a84caf7594d010bfdf1a..85e9d97d8a805e7b86213d3460eb62f9b4a5e7b4 100644 +index a9f3bddd33cf7f7773c262f1b818eed9895987ef..e828759ffc9838451f01cb9312cf2c4cffb5528e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -246,7 +246,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; diff --git a/patches/unapplied/server/0025-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0025-Further-improve-server-tick-loop.patch index 052d2f9190..050eaa62f3 100644 --- a/patches/unapplied/server/0025-Further-improve-server-tick-loop.patch +++ b/patches/unapplied/server/0025-Further-improve-server-tick-loop.patch @@ -144,7 +144,7 @@ index eef07309b24e88820d35517dd868fff25f777262..e26818bd6fb2216ab9b363affe99e4b6 this.startMetricsRecordingTick(); this.profiler.push("tick"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 85e9d97d8a805e7b86213d3460eb62f9b4a5e7b4..ec97233239d38b3e7b4256eb4e5d5f5c28b904c4 100644 +index e828759ffc9838451f01cb9312cf2c4cffb5528e..46f895acd74de17784d0c5efc66caf10a8be8686 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2391,6 +2391,17 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch index 361a7c1a18..cb9c5b38cd 100644 --- a/patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch +++ b/patches/unapplied/server/0047-Ensure-commands-are-not-ran-async.patch @@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren that it is happening so that plugin authors can fix their code to stop executing commands async. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 628ae2171c42d04b418001bf542e25ebe12bb18e..f20233b5b6afd0fd5cc824094eab3bd8b780da29 100644 +index 96c59b0e5ac3d36c8ecd513b64723e7dbe5d9b3a..b85e557972e37566c853e0b4f882719b4d8bb293 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1872,6 +1872,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -48,7 +48,7 @@ index 628ae2171c42d04b418001bf542e25ebe12bb18e..f20233b5b6afd0fd5cc824094eab3bd8 } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) { // Do nothing, this is coming from a plugin diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ec97233239d38b3e7b4256eb4e5d5f5c28b904c4..7a3017c13405acebc1c8519855fc84a44323289d 100644 +index 46f895acd74de17784d0c5efc66caf10a8be8686..b6e8bf97d961c5b3fd59c8eab11db5d7cf11fe36 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -857,6 +857,28 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0049-Expose-server-CommandMap.patch b/patches/unapplied/server/0049-Expose-server-CommandMap.patch index 47f5b6e772..58807b4f7b 100644 --- a/patches/unapplied/server/0049-Expose-server-CommandMap.patch +++ b/patches/unapplied/server/0049-Expose-server-CommandMap.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7a3017c13405acebc1c8519855fc84a44323289d..5ed1c47fd7725ffc148bd2e21275f690fab9a6fe 100644 +index b6e8bf97d961c5b3fd59c8eab11db5d7cf11fe36..680453b00b7fad402d0311141d82a9f0dd6cce2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1975,6 +1975,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0054-Add-velocity-warnings.patch b/patches/unapplied/server/0054-Add-velocity-warnings.patch index 6104cabba8..bbf4214f57 100644 --- a/patches/unapplied/server/0054-Add-velocity-warnings.patch +++ b/patches/unapplied/server/0054-Add-velocity-warnings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5ed1c47fd7725ffc148bd2e21275f690fab9a6fe..139c681d379f65f7ef591a3c84042d75f541b847 100644 +index 680453b00b7fad402d0311141d82a9f0dd6cce2e..3341fb3250f2dd06328e7ec8ee2758d7497eaecc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -279,6 +279,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0061-Complete-resource-pack-API.patch b/patches/unapplied/server/0061-Complete-resource-pack-API.patch index 73848d7b36..bbbb810668 100644 --- a/patches/unapplied/server/0061-Complete-resource-pack-API.patch +++ b/patches/unapplied/server/0061-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 f20233b5b6afd0fd5cc824094eab3bd8b780da29..3c1ba48beeac8793c05055da4525b084adefa4c0 100644 +index b85e557972e37566c853e0b4f882719b4d8bb293..7fdc50a94f18f8a2417643fdd174b754d04999ab 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1654,8 +1654,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch index ef011f95cc..2341fe77da 100644 --- a/patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch +++ b/patches/unapplied/server/0062-Default-loading-permissions.yml-before-plugins.patch @@ -30,7 +30,7 @@ index 7bbcee19248933f67fd40f46db43363890593c73..16707c734f33f6080875e5e3ea338aff + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 139c681d379f65f7ef591a3c84042d75f541b847..1ef1d0d9341ab8c633d3899336a990688b7f79dd 100644 +index 3341fb3250f2dd06328e7ec8ee2758d7497eaecc..63002e9defc876d974426a1e7f087fa421215b8d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -456,6 +456,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch index 2bcde265f1..b4a5f50305 100644 --- a/patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch +++ b/patches/unapplied/server/0063-Allow-Reloading-of-Custom-Permissions.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1ef1d0d9341ab8c633d3899336a990688b7f79dd..d317d6853e2b129e9b638f4e76b383f0d53d3cf7 100644 +index 63002e9defc876d974426a1e7f087fa421215b8d..37f5448a201aafd799fc661498d44e583632ae91 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2521,5 +2521,23 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0064-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0064-Remove-Metadata-on-reload.patch index dfc35537ae..b1dfccacad 100644 --- a/patches/unapplied/server/0064-Remove-Metadata-on-reload.patch +++ b/patches/unapplied/server/0064-Remove-Metadata-on-reload.patch @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d317d6853e2b129e9b638f4e76b383f0d53d3cf7..83cb2762b9dc078602fd94852da847220c3190d6 100644 +index 37f5448a201aafd799fc661498d44e583632ae91..93b55593da49e181f8863347c28043a32e1460dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -945,8 +945,16 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch index a6ead0838e..79f10f3696 100644 --- a/patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/unapplied/server/0079-Add-PlayerUseUnknownEntityEvent.patch @@ -20,7 +20,7 @@ index 8834ed411a7db86b4d2b88183a1315317107d719..c45b5ab6776f3ac79f856c3a6467c510 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 3c1ba48beeac8793c05055da4525b084adefa4c0..df741167eb98645aaf60616a7bfc5e1f0cb7c824 100644 +index 7fdc50a94f18f8a2417643fdd174b754d04999ab..782e83989b82ca5547f953473b199694ed2f6690 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2220,8 +2220,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch index dfa1fd6da8..58f4336c60 100644 --- a/patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch +++ b/patches/unapplied/server/0102-Add-setting-for-proxy-online-mode-status.patch @@ -67,7 +67,7 @@ index b7b98832be6178a2bca534bf974519ede977b282..aa3caccc58f1cec8d5f396813d7fc40b } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 83cb2762b9dc078602fd94852da847220c3190d6..a380fb3b192dea5805126f616390da52312749c1 100644 +index 93b55593da49e181f8863347c28043a32e1460dc..bc584d676aef3a107000a101db1323d1ea4d68e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1703,7 +1703,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0104-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0104-Configurable-packet-in-spam-threshold.patch index c65c1a7c57..9fed3d86a5 100644 --- a/patches/unapplied/server/0104-Configurable-packet-in-spam-threshold.patch +++ b/patches/unapplied/server/0104-Configurable-packet-in-spam-threshold.patch @@ -23,7 +23,7 @@ index 01b1eb60894a79bd10a035404cc796ce0d3725c8..77e1a4b9b0734734bbcf03b6adc1cf05 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index df741167eb98645aaf60616a7bfc5e1f0cb7c824..8f0a93e16860bbd062718248b958b72d7c6db0ee 100644 +index 782e83989b82ca5547f953473b199694ed2f6690..9ab89d4a6e76e450c735733702bba11ef0173f2f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1503,13 +1503,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0105-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0105-Configurable-flying-kick-messages.patch index 49de587c8c..ee3f0e691c 100644 --- a/patches/unapplied/server/0105-Configurable-flying-kick-messages.patch +++ b/patches/unapplied/server/0105-Configurable-flying-kick-messages.patch @@ -21,7 +21,7 @@ index 77e1a4b9b0734734bbcf03b6adc1cf0552063d1f..2440e81ef23c3b8c91ca5bdf13347f13 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8f0a93e16860bbd062718248b958b72d7c6db0ee..192b0fae5ef200efefeb9727a68c17e3ca962027 100644 +index 9ab89d4a6e76e450c735733702bba11ef0173f2f..8a0c3a8f96ed260fa205e1395b4f8e30e563bd34 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch index 0597b3ce35..ffd0118c2b 100644 --- a/patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch +++ b/patches/unapplied/server/0109-Allow-Reloading-of-Command-Aliases.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a380fb3b192dea5805126f616390da52312749c1..028f2e2d24a6a1eac07c04d79c44bbdfe87108cb 100644 +index bc584d676aef3a107000a101db1323d1ea4d68e8..f3024dcf7d29359931af1a2d00aa429a75e449a1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2547,5 +2547,24 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch index b2543d10ad..761e216d6c 100644 --- a/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch +++ b/patches/unapplied/server/0119-Properly-fix-item-duplication-bug.patch @@ -19,7 +19,7 @@ index 8eb9a96e879a28841fcc338ff5c90f86908414bc..eaa968b6d91160947235fad29d3b955b @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 192b0fae5ef200efefeb9727a68c17e3ca962027..28c768e758a10d2d109a4cd12779d6d40e9c43f8 100644 +index 8a0c3a8f96ed260fa205e1395b4f8e30e563bd34..e4889e2bf90e7110f8cfef3b9eeb815b05e8e450 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2846,7 +2846,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 874367c853..75fd5b8b2b 100644 --- a/patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/patches/unapplied/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -26,7 +26,7 @@ index ee8ce0e5bdb0acb7d6ef3439a388e108ea1807de..aa8a02c9fab8938e8064a60f1faf5421 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 28c768e758a10d2d109a4cd12779d6d40e9c43f8..f38c6482651cb9a8a8dc2a25c55aaf2a7deccc7b 100644 +index e4889e2bf90e7110f8cfef3b9eeb815b05e8e450..72395ede1fe2570fb5bd463ddff191fc50b98191 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2070,6 +2070,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch index 7fface4ef4..46342d682e 100644 --- a/patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/patches/unapplied/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch @@ -20,7 +20,7 @@ index 2440e81ef23c3b8c91ca5bdf13347f13cb66f549..2a4aacd2461401a109d749eee2628133 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 028f2e2d24a6a1eac07c04d79c44bbdfe87108cb..e0460aa4154ea31743c6b99ff0ec009a37f7fee4 100644 +index f3024dcf7d29359931af1a2d00aa429a75e449a1..c8d7a4d917ac9534309dfcc2c2448e720ed6a7a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2566,5 +2566,10 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch index 0e49e51073..46d3277383 100644 --- a/patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/unapplied/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -236,7 +236,7 @@ index 17afebfc2091392c5ec9aa9f6734ff71d67c9dac..caf92576ed2023f721810b7dd09dd194 this.bans = new UserBanList(PlayerList.USERBANLIST_FILE); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e0460aa4154ea31743c6b99ff0ec009a37f7fee4..39a64d8257b2405aa3f94b01fdb858ced0a9342d 100644 +index c8d7a4d917ac9534309dfcc2c2448e720ed6a7a5..933a06f998fe79eaae05bbff6af5398db0104187 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -45,7 +45,6 @@ import java.util.logging.Level; diff --git a/patches/unapplied/server/0138-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0138-Add-UnknownCommandEvent.patch index 743e93af20..5fba8215b0 100644 --- a/patches/unapplied/server/0138-Add-UnknownCommandEvent.patch +++ b/patches/unapplied/server/0138-Add-UnknownCommandEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 39a64d8257b2405aa3f94b01fdb858ced0a9342d..b28f2e8fa2c62562cf87cf264e97b6d7c233297b 100644 +index 933a06f998fe79eaae05bbff6af5398db0104187..7fd1a8bb05e0e25711bf2986a0b8c7f82c20e072 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -886,7 +886,13 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0139-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0139-Basic-PlayerProfile-API.patch index a07fbfe791..1d700bb7fb 100644 --- a/patches/unapplied/server/0139-Basic-PlayerProfile-API.patch +++ b/patches/unapplied/server/0139-Basic-PlayerProfile-API.patch @@ -621,7 +621,7 @@ index c4142568c3188c89142799cc4911dd7eae32a45f..f379e108ec3c762940bddea878a0a711 String s1 = name.toLowerCase(Locale.ROOT); GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b28f2e8fa2c62562cf87cf264e97b6d7c233297b..e6db5d649d01c4952dc5e3bf08f9ce15afbd0963 100644 +index 7fd1a8bb05e0e25711bf2986a0b8c7f82c20e072..c091aa6cbb541ce5349ffb183bc7d67b0c4fafeb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -244,6 +244,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; diff --git a/patches/unapplied/server/0155-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0155-Add-PlayerJumpEvent.patch index a138bd6b69..1207afe385 100644 --- a/patches/unapplied/server/0155-Add-PlayerJumpEvent.patch +++ b/patches/unapplied/server/0155-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 f38c6482651cb9a8a8dc2a25c55aaf2a7deccc7b..f52fcfc8763bff9635eb117a201cc954cc7f8154 100644 +index 72395ede1fe2570fb5bd463ddff191fc50b98191..b339a9b20f2d81a5f93bf2266d9896aae3886c3d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1186,7 +1186,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0156-handle-PacketPlayInKeepAlive-async.patch b/patches/unapplied/server/0156-handle-PacketPlayInKeepAlive-async.patch index 600c3e2336..1a19c6cea8 100644 --- a/patches/unapplied/server/0156-handle-PacketPlayInKeepAlive-async.patch +++ b/patches/unapplied/server/0156-handle-PacketPlayInKeepAlive-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 f52fcfc8763bff9635eb117a201cc954cc7f8154..abde2821d59717517bda456b45a28a1d5054c6ba 100644 +index b339a9b20f2d81a5f93bf2266d9896aae3886c3d..a74b0cda6451e4368744e6d191bc5cf50eac3109 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2805,14 +2805,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0158-revert-serverside-behavior-of-keepalives.patch index 2277d6e5c0..d04e4c465a 100644 --- a/patches/unapplied/server/0158-revert-serverside-behavior-of-keepalives.patch +++ b/patches/unapplied/server/0158-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 abde2821d59717517bda456b45a28a1d5054c6ba..f6fd0aa58927b51803c42b342abbf571b3d5638b 100644 +index a74b0cda6451e4368744e6d191bc5cf50eac3109..e7f39bebc1ac4cbc5a0a7109c21d16d8126fd3cc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -221,9 +221,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0165-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0165-AsyncTabCompleteEvent.patch index 92babe53c4..bca3b525aa 100644 --- a/patches/unapplied/server/0165-AsyncTabCompleteEvent.patch +++ b/patches/unapplied/server/0165-AsyncTabCompleteEvent.patch @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f6fd0aa58927b51803c42b342abbf571b3d5638b..228465eb602e4c289fdfc93bab06921a50be7638 100644 +index e7f39bebc1ac4cbc5a0a7109c21d16d8126fd3cc..ee482d8942a355d989a2c913c23245bdbfb866a1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -708,10 +708,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -72,7 +72,7 @@ index f6fd0aa58927b51803c42b342abbf571b3d5638b..228465eb602e4c289fdfc93bab06921a @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e6db5d649d01c4952dc5e3bf08f9ce15afbd0963..7d66377a431a3aedfd1338664cba2b83d100cae2 100644 +index c091aa6cbb541ce5349ffb183bc7d67b0c4fafeb..77c5180d36f09cfeb7a82c6e321793ac1a363a48 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2078,7 +2078,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0181-getPlayerUniqueId-API.patch b/patches/unapplied/server/0181-getPlayerUniqueId-API.patch index d05e12bcfd..fee0830cfa 100644 --- a/patches/unapplied/server/0181-getPlayerUniqueId-API.patch +++ b/patches/unapplied/server/0181-getPlayerUniqueId-API.patch @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7d66377a431a3aedfd1338664cba2b83d100cae2..882a2afed87c1b0d23733831c33391b414c4efcb 100644 +index 77c5180d36f09cfeb7a82c6e321793ac1a363a48..8d888beec17bdea0621116d3038bb3d72e4b3c5d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1705,6 +1705,25 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 15b76b6f89..b67102f44b 100644 --- a/patches/unapplied/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/unapplied/server/0189-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 228465eb602e4c289fdfc93bab06921a50be7638..99d2a71133b82f5a72869a8c424fe2b42ae5b760 100644 +index ee482d8942a355d989a2c913c23245bdbfb866a1..ba368d11aac5f440dfb45d0c283013390bb2aeff 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2811,9 +2811,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch index 477ce0b147..a58db4c8f0 100644 --- a/patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch +++ b/patches/unapplied/server/0215-InventoryCloseEvent-Reason-API.patch @@ -75,7 +75,7 @@ index 3c780c0679ba004577393b3d801ee18ac7e847b9..495acba272889277768a6673d7b2b2b6 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 99d2a71133b82f5a72869a8c424fe2b42ae5b760..6a550b076e0cbcb8c90c74cdf5dcea21c643a2f6 100644 +index ba368d11aac5f440dfb45d0c283013390bb2aeff..67ec90f47e7d8bb4a642f3bf9b56bb686fc8cee9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -188,6 +188,7 @@ import org.bukkit.event.inventory.ClickType; diff --git a/patches/unapplied/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 29ba8ef6d0..314f19655d 100644 --- a/patches/unapplied/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/unapplied/server/0217-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 6a550b076e0cbcb8c90c74cdf5dcea21c643a2f6..e2da92d30ee405875dd711c1c118a97d2532b38e 100644 +index 67ec90f47e7d8bb4a642f3bf9b56bb686fc8cee9..ffa4dbe3565a5aeccded6add79a1d783ec13ae61 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2235,6 +2235,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/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 index 5a4f42a9f4..044ffafaf6 100644 --- a/patches/unapplied/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 @@ -45,7 +45,7 @@ index b46b10c726b53b1106cc74ec9a5d6ca6f45c96fe..c3539fabda1887cca6e82abce26dff08 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e2da92d30ee405875dd711c1c118a97d2532b38e..be201267110d8cebb8d4c657f3b40191b38b4819 100644 +index ffa4dbe3565a5aeccded6add79a1d783ec13ae61..0680946b445b0727ab66f201ee08cf1b5927f550 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch index 13e3f8433c..f8fc760d9f 100644 --- a/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch @@ -48,7 +48,7 @@ index c7881eebb02424ce488d2c04aa736f17402109a0..4f070d2a7ff5dfe9890e79c30911a1fe long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop lastTick = start - TICK_TIME; // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 882a2afed87c1b0d23733831c33391b414c4efcb..32e36ac1955ef02388a492c39c3a2698e229641b 100644 +index 8d888beec17bdea0621116d3038bb3d72e4b3c5d..ee25c3a9f499017dcd2adbc789030bd2d7cce7c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -905,6 +905,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0253-Asynchronous-chunk-IO-and-loading.patch b/patches/unapplied/server/0253-Asynchronous-chunk-IO-and-loading.patch index d51d04a5d8..2950c20b3a 100644 --- a/patches/unapplied/server/0253-Asynchronous-chunk-IO-and-loading.patch +++ b/patches/unapplied/server/0253-Asynchronous-chunk-IO-and-loading.patch @@ -2866,7 +2866,7 @@ index 0d536d72ac918fbd403397ff369d10143ee9c204..be677d437d17b74c6188ce1bd5fc6fdc private final String name; private final Comparator comparator; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index be201267110d8cebb8d4c657f3b40191b38b4819..d8cc0680c73da2e594cb091138fc4626e4eb60ec 100644 +index 0680946b445b0727ab66f201ee08cf1b5927f550..84403ae9d6900c3dfce4e4e9063a28275277fc2d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -717,6 +717,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0274-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0274-Add-Velocity-IP-Forwarding-Support.patch index c4dcbdcdbc..c8c46395b2 100644 --- a/patches/unapplied/server/0274-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/unapplied/server/0274-Add-Velocity-IP-Forwarding-Support.patch @@ -225,7 +225,7 @@ index 5ebc450432805d52457b9f8ff1e2b1981bdd78e6..4c06e62e967f28eb844d74237948834e } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 32e36ac1955ef02388a492c39c3a2698e229641b..b0f7f44569f119d9e16bc468124b69244c61bf87 100644 +index ee25c3a9f499017dcd2adbc789030bd2d7cce7c4..c4c7120808a42dc36fbd85d9a842792797193a55 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -760,7 +760,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch index a0375ddd66..7190093cf6 100644 --- a/patches/unapplied/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/unapplied/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -20,7 +20,7 @@ index 85ad9a1a29d0cb11f552d8f34b210f1bf4bdd810..0078fb8df378058a6ddeb5dbea4132c8 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d8cc0680c73da2e594cb091138fc4626e4eb60ec..4792fd0a8125ed1be1c5c1ee46138cb5b6c03ac5 100644 +index 84403ae9d6900c3dfce4e4e9063a28275277fc2d..6c7b30c0363b7965bc71704d8432cf21c20a1cc7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -498,9 +498,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch index 67ebd3e373..412f214173 100644 --- a/patches/unapplied/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/unapplied/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch @@ -59,7 +59,7 @@ index 91d6885da13138e1def16e1876910ef893ce244d..eb58536e37af9da5e3ae7e43f874a1ef 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 4792fd0a8125ed1be1c5c1ee46138cb5b6c03ac5..7a4bb44455ddf5f594e4262e1196b23c81e6ec30 100644 +index 6c7b30c0363b7965bc71704d8432cf21c20a1cc7..d160602ac0d69e3a5e5c7ada66c752691321bb00 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1567,7 +1567,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0286-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0286-Make-the-default-permission-message-configurable.patch index ec064d9c2d..132d72492c 100644 --- a/patches/unapplied/server/0286-Make-the-default-permission-message-configurable.patch +++ b/patches/unapplied/server/0286-Make-the-default-permission-message-configurable.patch @@ -42,7 +42,7 @@ index 65df47283afc4aa1453fdd18e65e6f8cb3bd0c3f..80306b595b555d4057975a07872084a8 Object val = config.get("settings.save-player-data"); if (val instanceof Boolean) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b0f7f44569f119d9e16bc468124b69244c61bf87..04457c57b971ef16b202768c26f6e98fe9b1602f 100644 +index c4c7120808a42dc36fbd85d9a842792797193a55..cf00b51faaefd6607ab11003276a48f394b25f71 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2606,6 +2606,11 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0291-Book-Size-Limits.patch b/patches/unapplied/server/0291-Book-Size-Limits.patch index 3cb4a40976..b4735b0eaa 100644 --- a/patches/unapplied/server/0291-Book-Size-Limits.patch +++ b/patches/unapplied/server/0291-Book-Size-Limits.patch @@ -24,7 +24,7 @@ index 80306b595b555d4057975a07872084a83abe78ae..0be8f68c3e61f132ada9381e36b743dd private static void asyncChunks() { ConfigurationSection section; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7a4bb44455ddf5f594e4262e1196b23c81e6ec30..237137713a07db847a37af3a79f3489ee25d6350 100644 +index d160602ac0d69e3a5e5c7ada66c752691321bb00..77d62668dc22df5e9be714fa32f7b24d256361a9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1016,6 +1016,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0299-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0299-Implement-Brigadier-Mojang-API.patch index 8959b49b02..69dda49ec7 100644 --- a/patches/unapplied/server/0299-Implement-Brigadier-Mojang-API.patch +++ b/patches/unapplied/server/0299-Implement-Brigadier-Mojang-API.patch @@ -81,7 +81,7 @@ index f3bbe012541a71ab75c1863990d0c056c62d8c6e..4bc28b66788d06d1446284f5adef6a44 event.getPlayer().getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 237137713a07db847a37af3a79f3489ee25d6350..a83f557b39858662e8ca9acf7d751093eb1959ec 100644 +index 77d62668dc22df5e9be714fa32f7b24d256361a9..95853e761f7c22b251d722031d068475733435ef 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -757,8 +757,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0301-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0301-Limit-Client-Sign-length-more.patch index db67eb26cb..8d0cf3369d 100644 --- a/patches/unapplied/server/0301-Limit-Client-Sign-length-more.patch +++ b/patches/unapplied/server/0301-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 a83f557b39858662e8ca9acf7d751093eb1959ec..cab78d85bda9b4d7113a4fae929224b7c5bfcdb0 100644 +index 95853e761f7c22b251d722031d068475733435ef..9933821711eab76bb08be74252639dc3093dfb88 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0309-Update-entity-Metadata-for-all-tracked-players.patch b/patches/unapplied/server/0309-Update-entity-Metadata-for-all-tracked-players.patch index 2f3a86283a..06c073fc17 100644 --- a/patches/unapplied/server/0309-Update-entity-Metadata-for-all-tracked-players.patch +++ b/patches/unapplied/server/0309-Update-entity-Metadata-for-all-tracked-players.patch @@ -22,7 +22,7 @@ index 861f3790179e18f6192ac8b2fb5d2ecbc54484ad..5e3f489964489e0facc93a823a1cb84b this.broadcast.accept(packet); if (this.entity instanceof ServerPlayer) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cab78d85bda9b4d7113a4fae929224b7c5bfcdb0..b346c906cea1f6d08203bedb1c6acf61dc6a1d22 100644 +index 9933821711eab76bb08be74252639dc3093dfb88..4788c98dc93547f3308cb565eee9cfc4947f91eb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2309,7 +2309,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch index 6f0e8c3cd2..26a338811e 100644 --- a/patches/unapplied/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/patches/unapplied/server/0318-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 b346c906cea1f6d08203bedb1c6acf61dc6a1d22..a6017a80e5015929903e8fe29e6335615a322700 100644 +index 4788c98dc93547f3308cb565eee9cfc4947f91eb..c205534209dc1de3b0ff49762361a23d55434742 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -439,7 +439,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/unapplied/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 45f46e7ec1..23fb3c0afb 100644 --- a/patches/unapplied/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/patches/unapplied/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -29,7 +29,7 @@ index dbf70401a93776f422af4386bceaae6fb9883c4f..99b4f6ad3a973e400e37d53b977e1957 public boolean isDebugging() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 04457c57b971ef16b202768c26f6e98fe9b1602f..4323bbd4763b9bd5eebd3313c3de3c6070251c42 100644 +index cf00b51faaefd6607ab11003276a48f394b25f71..17ad98a31c1eacb701c67c39b6c84e9de4e06893 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2067,7 +2067,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0327-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0327-Expose-the-internal-current-tick.patch index 014508dc7b..d8a310eabe 100644 --- a/patches/unapplied/server/0327-Expose-the-internal-current-tick.patch +++ b/patches/unapplied/server/0327-Expose-the-internal-current-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4323bbd4763b9bd5eebd3313c3de3c6070251c42..669e4b41cf0751afb67d94b6a511bcfd18ce7ef4 100644 +index 17ad98a31c1eacb701c67c39b6c84e9de4e06893..43038b4772975c1fb171c30382ae0a6c43d13676 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2642,5 +2642,10 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0335-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0335-Dont-send-unnecessary-sign-update.patch index ff20fd7e96..936cbbdd39 100644 --- a/patches/unapplied/server/0335-Dont-send-unnecessary-sign-update.patch +++ b/patches/unapplied/server/0335-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 a6017a80e5015929903e8fe29e6335615a322700..db8d4355bfde3777b943984fb7c9e0c035098e64 100644 +index c205534209dc1de3b0ff49762361a23d55434742..b37a611c4492a46a72bc7d1d6216efdfed4ff2de 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2888,6 +2888,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/unapplied/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index 37091dcf88..bfad17e179 100644 --- a/patches/unapplied/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/patches/unapplied/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new Fixes GH-2718 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index db8d4355bfde3777b943984fb7c9e0c035098e64..e424e29ecd90f17e84d37105f8fdde85df406813 100644 +index b37a611c4492a46a72bc7d1d6216efdfed4ff2de..d5ee915958710a65ecaf8f17d3d07e47060b3eae 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1757,6 +1757,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0356-Anti-Xray.patch b/patches/unapplied/server/0356-Anti-Xray.patch index f4559086e6..fcddd72018 100644 --- a/patches/unapplied/server/0356-Anti-Xray.patch +++ b/patches/unapplied/server/0356-Anti-Xray.patch @@ -1603,7 +1603,7 @@ index f3c67a815c570beb14136905cbf5aa4046ee8394..f8f44cb6e823a0150f3abdab133f8ae2 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 669e4b41cf0751afb67d94b6a511bcfd18ce7ef4..3ff85d9d8518db712ca1d2977a5865daef86f021 100644 +index 43038b4772975c1fb171c30382ae0a6c43d13676..dacec59aa5e6154ae311720ef70e7a05a75bef29 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2222,7 +2222,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0376-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0376-Add-tick-times-API-and-mspt-command.patch index 90856a0e69..85c1529953 100644 --- a/patches/unapplied/server/0376-Add-tick-times-API-and-mspt-command.patch +++ b/patches/unapplied/server/0376-Add-tick-times-API-and-mspt-command.patch @@ -181,7 +181,7 @@ index 632743678f8c65e078080fda7c8eeee9a2d5753c..03ebc2a0476aef9297cbbc7f35891570 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3ff85d9d8518db712ca1d2977a5865daef86f021..e270d7786eb1eae8970ff2ed5896789e05ca6613 100644 +index dacec59aa5e6154ae311720ef70e7a05a75bef29..5f44ad8b1a982608075db813abd2e536252e0c81 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2467,6 +2467,16 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0377-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0377-Expose-MinecraftServer-isRunning.patch index dc0a39b360..af93677f96 100644 --- a/patches/unapplied/server/0377-Expose-MinecraftServer-isRunning.patch +++ b/patches/unapplied/server/0377-Expose-MinecraftServer-isRunning.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e270d7786eb1eae8970ff2ed5896789e05ca6613..a67fc9b0899f9d2128ac202ba0c12776653dfe28 100644 +index 5f44ad8b1a982608075db813abd2e536252e0c81..21a10a0dc98cb2c669a505d6185c2093855afae6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2657,5 +2657,10 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0388-Improved-Watchdog-Support.patch b/patches/unapplied/server/0388-Improved-Watchdog-Support.patch index b7514bfb13..20a652c50e 100644 --- a/patches/unapplied/server/0388-Improved-Watchdog-Support.patch +++ b/patches/unapplied/server/0388-Improved-Watchdog-Support.patch @@ -323,7 +323,7 @@ index f994d393929ca6813d4209fb9c93550e4f692228..0b049b267a1e1d6b48c035ed54ff2433 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/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a67fc9b0899f9d2128ac202ba0c12776653dfe28..59d0ada796efc4b2cf65d8398911f132320482ee 100644 +index 21a10a0dc98cb2c669a505d6185c2093855afae6..9e2adc414d43f0c91f222be5f082e74d9db173aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2067,7 +2067,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0400-Load-Chunks-for-Login-Asynchronously.patch b/patches/unapplied/server/0400-Load-Chunks-for-Login-Asynchronously.patch index b8e91009fa..c143a66dcf 100644 --- a/patches/unapplied/server/0400-Load-Chunks-for-Login-Asynchronously.patch +++ b/patches/unapplied/server/0400-Load-Chunks-for-Login-Asynchronously.patch @@ -37,7 +37,7 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8 public static final TicketType UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1); public static final TicketType PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e424e29ecd90f17e84d37105f8fdde85df406813..b174bfdd8457d5e1a9d8c65c542a544639488ddf 100644 +index d5ee915958710a65ecaf8f17d3d07e47060b3eae..31341e74ab18a8ea5110adff1e9d42b7473ca89f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -220,6 +220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch index 442b664947..e232fbefb8 100644 --- a/patches/unapplied/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/unapplied/server/0407-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 b174bfdd8457d5e1a9d8c65c542a544639488ddf..3123726036d98c4d7f3b38c753ac0a27b32f5d44 100644 +index 31341e74ab18a8ea5110adff1e9d42b7473ca89f..47e841add3437c9ab271569e00b4b385ce2ced66 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -885,7 +885,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0408-Expose-game-version.patch b/patches/unapplied/server/0408-Expose-game-version.patch index ea6ec3a7c0..1b9b250d2c 100644 --- a/patches/unapplied/server/0408-Expose-game-version.patch +++ b/patches/unapplied/server/0408-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 59d0ada796efc4b2cf65d8398911f132320482ee..72effec1790b024bd3010207d389b257aa402161 100644 +index 9e2adc414d43f0c91f222be5f082e74d9db173aa..271f4ab919788bfad7ce750b1dafc742debed674 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -573,6 +573,13 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0411-misc-debugging-dumps.patch b/patches/unapplied/server/0411-misc-debugging-dumps.patch index f063349bbb..e6ae3f6f57 100644 --- a/patches/unapplied/server/0411-misc-debugging-dumps.patch +++ b/patches/unapplied/server/0411-misc-debugging-dumps.patch @@ -74,7 +74,7 @@ index 0af65f1698e4ee9d94724f19b0abd61c437f18f2..d21f45d983bf3047811d2d73f4a38deb this.connection.send(new ClientboundDisconnectPacket(chatmessage)); this.connection.disconnect(chatmessage); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 72effec1790b024bd3010207d389b257aa402161..3a85c5884ebf0c8e1c4fe45925aca383f65531c8 100644 +index 271f4ab919788bfad7ce750b1dafc742debed674..0ea163f4443bc07727675e3c05b9e1d68c52f78a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -997,6 +997,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0412-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0412-Prevent-teleporting-dead-entities.patch index 7250b13163..ed494137d5 100644 --- a/patches/unapplied/server/0412-Prevent-teleporting-dead-entities.patch +++ b/patches/unapplied/server/0412-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 3123726036d98c4d7f3b38c753ac0a27b32f5d44..6d4dcfa3a3c62a37192c570e5e3274b550236b45 100644 +index 47e841add3437c9ab271569e00b4b385ce2ced66..9f80408a7cf39f1f8b58c688b91de4731208e93d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1528,6 +1528,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0414-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0414-Implement-Mob-Goal-API.patch index cb3406a121..b13bb87a45 100644 --- a/patches/unapplied/server/0414-Implement-Mob-Goal-API.patch +++ b/patches/unapplied/server/0414-Implement-Mob-Goal-API.patch @@ -785,7 +785,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31 LOOK, JUMP, diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3a85c5884ebf0c8e1c4fe45925aca383f65531c8..9cdefc0cabae51d37149cda47fff5432c8c9ebed 100644 +index 0ea163f4443bc07727675e3c05b9e1d68c52f78a..44c5938edda0aeab0b65f1179ef7dad6356462da 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2670,5 +2670,11 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0421-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0421-Wait-for-Async-Tasks-during-shutdown.patch index 98dd78c9a4..91fbc00442 100644 --- a/patches/unapplied/server/0421-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/unapplied/server/0421-Wait-for-Async-Tasks-during-shutdown.patch @@ -22,7 +22,7 @@ index abb640370da876a18a3eba952b19cfa9d0f73743..12c1cee3b3055b44d0ca3196eb37e518 // CraftBukkit end if (this.getConnection() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9cdefc0cabae51d37149cda47fff5432c8c9ebed..285fe248bccfcd32521bbab071192abffd762531 100644 +index 44c5938edda0aeab0b65f1179ef7dad6356462da..0e339c13f58419a6af39b99782160ac3155b0606 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1006,6 +1006,35 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch index cddd429b38..bcab36c333 100644 --- a/patches/unapplied/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/unapplied/server/0439-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 6d4dcfa3a3c62a37192c570e5e3274b550236b45..58c25a32844eec23e60d5e3b814d1a17253c80f7 100644 +index 9f80408a7cf39f1f8b58c688b91de4731208e93d..61d5b5001979751da986fd8a634a58094c172946 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1342,6 +1342,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch index b1303705d8..7663aac0e2 100644 --- a/patches/unapplied/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch +++ b/patches/unapplied/server/0442-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 58c25a32844eec23e60d5e3b814d1a17253c80f7..6c583e7f1256652434348a355e90fc3d5dbda3aa 100644 +index 61d5b5001979751da986fd8a634a58094c172946..5069017665f98a8b3900220b01ca4b99bc8d2f93 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2805,9 +2805,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0444-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0444-Add-permission-for-command-blocks.patch index 51bf90aa3c..feaf0be335 100644 --- a/patches/unapplied/server/0444-Add-permission-for-command-blocks.patch +++ b/patches/unapplied/server/0444-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index d4f57fde2f02071dfde08cb2a5c8359984056aef..176e5bbac94cf39805dcacfcae3a3daa 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 6c583e7f1256652434348a355e90fc3d5dbda3aa..df1535e0bd37f868ac4091fc8626ccef593a4843 100644 +index 5069017665f98a8b3900220b01ca4b99bc8d2f93..b03b8bb8e3f19de772d41bc5a9bda3192273df07 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -796,7 +796,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index b043efde24..3ff88ec220 100644 --- a/patches/unapplied/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/unapplied/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -89,7 +89,7 @@ index 90a844229e4a3ef5193cffc2c742b4c5a305a91c..d60d3ea1ec9c14dafda9f0fffd16ed2b 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 df1535e0bd37f868ac4091fc8626ccef593a4843..3b18f7fafce62cb107a3a7c1558ea544ab10454c 100644 +index b03b8bb8e3f19de772d41bc5a9bda3192273df07..6acc4ee50ba32a208930bda89d37f155e3f4835a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3063,7 +3063,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -102,7 +102,7 @@ index df1535e0bd37f868ac4091fc8626ccef593a4843..3b18f7fafce62cb107a3a7c1558ea544 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 285fe248bccfcd32521bbab071192abffd762531..8c61da70f609cd8cd5939cd12edc118d65fc734a 100644 +index 0e339c13f58419a6af39b99782160ac3155b0606..0c736a05aaaaaaba65730ca9c731045ac1c9338c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -945,8 +945,8 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch index 9cd9f1ce29..8c2d615cdd 100644 --- a/patches/unapplied/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch +++ b/patches/unapplied/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch @@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8c61da70f609cd8cd5939cd12edc118d65fc734a..017e351e14a6a3a4c711df84f81936c296da13e1 100644 +index 0c736a05aaaaaaba65730ca9c731045ac1c9338c..212e43114e4797669338ffdd47548d0100365380 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -359,7 +359,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0471-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0471-Move-range-check-for-block-placing-up.patch index c6c03f240a..ab210cf050 100644 --- a/patches/unapplied/server/0471-Move-range-check-for-block-placing-up.patch +++ b/patches/unapplied/server/0471-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 3b18f7fafce62cb107a3a7c1558ea544ab10454c..ee9264d090db36668d2fe745734dd27b3f1556db 100644 +index 6acc4ee50ba32a208930bda89d37f155e3f4835a..0f031b094a180bcce1fe3b388321db838ca4df63 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1686,6 +1686,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0480-Brand-support.patch b/patches/unapplied/server/0480-Brand-support.patch index 930d392797..732375216e 100644 --- a/patches/unapplied/server/0480-Brand-support.patch +++ b/patches/unapplied/server/0480-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ee9264d090db36668d2fe745734dd27b3f1556db..c0556da4b8a48523468456bd130726a56387ec0c 100644 +index 0f031b094a180bcce1fe3b388321db838ca4df63..5611238634230f434170e895a84ae22ca2870b9c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -38,6 +38,7 @@ import net.minecraft.nbt.CompoundTag; diff --git a/patches/unapplied/server/0481-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0481-Add-setMaxPlayers-API.patch index 2afb00b44c..6c4b44aacf 100644 --- a/patches/unapplied/server/0481-Add-setMaxPlayers-API.patch +++ b/patches/unapplied/server/0481-Add-setMaxPlayers-API.patch @@ -18,7 +18,7 @@ index 019bbc77fe0a85de6d8eef53496981d1d7d0c320..f9ef6e64b95f90d69a897dd996a58774 private int simulationDistance; private boolean allowCheatsForAllPlayers; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 017e351e14a6a3a4c711df84f81936c296da13e1..98826babf8be2782b645c2417ed5a7595ed9a336 100644 +index 212e43114e4797669338ffdd47548d0100365380..ce09a46ed430a80471af48b7a8ca1bf7726395c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -668,6 +668,13 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 7f4c3255d3..3308ae9489 100644 --- a/patches/unapplied/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/unapplied/server/0499-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 c0556da4b8a48523468456bd130726a56387ec0c..33e178801b8b3eb4b8fbeb8bbc2f6db75378bb09 100644 +index 5611238634230f434170e895a84ae22ca2870b9c..3c4c6edc06e992543f7f1b190d662eb326550034 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -689,7 +689,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0510-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0510-Fix-for-large-move-vectors-crashing-server.patch index 59fa6d096c..76efb3412b 100644 --- a/patches/unapplied/server/0510-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/unapplied/server/0510-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 33e178801b8b3eb4b8fbeb8bbc2f6db75378bb09..1d266c92fb83086b61bb67b4692e117beab1f3aa 100644 +index 3c4c6edc06e992543f7f1b190d662eb326550034..1d5edba8fa2da4c8c8075bd7c165062970353830 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -509,9 +509,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0520-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0520-Add-getOfflinePlayerIfCached-String.patch index afbe50edae..0cfe38bb42 100644 --- a/patches/unapplied/server/0520-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/unapplied/server/0520-Add-getOfflinePlayerIfCached-String.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 98826babf8be2782b645c2417ed5a7595ed9a336..ce93a00aba502b6d3e962c9396a82ae2587a6b52 100644 +index ce09a46ed430a80471af48b7a8ca1bf7726395c9..a4e34932e8fadf834545db6533219ecf2bf52921 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1800,6 +1800,28 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0527-Add-API-for-quit-reason.patch b/patches/unapplied/server/0527-Add-API-for-quit-reason.patch index fa9571a921..7cf40671e1 100644 --- a/patches/unapplied/server/0527-Add-API-for-quit-reason.patch +++ b/patches/unapplied/server/0527-Add-API-for-quit-reason.patch @@ -37,7 +37,7 @@ index c363b5f48253cd77c6b986b85f068a38df5319b8..8003ede966f760d660575c56d6f949dd 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 1d266c92fb83086b61bb67b4692e117beab1f3aa..ad4e5c8c68712a9917352024427020f4793c762a 100644 +index 1d5edba8fa2da4c8c8075bd7c165062970353830..c1a21932f54b86a9824bf510d9a2a07aa058457b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -442,6 +442,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0540-Limit-recipe-packets.patch b/patches/unapplied/server/0540-Limit-recipe-packets.patch index a831594e4b..3d55b7c842 100644 --- a/patches/unapplied/server/0540-Limit-recipe-packets.patch +++ b/patches/unapplied/server/0540-Limit-recipe-packets.patch @@ -23,7 +23,7 @@ index 4bd335699f5f53b8303a86758a9dedae75bf8464..ccc60a5465efa2b71fc2593d75af62c0 public static boolean velocityOnlineMode; public static byte[] velocitySecretKey; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ad4e5c8c68712a9917352024427020f4793c762a..0a853329f7d3c0fe88dc033cd7d197a61ed590fc 100644 +index c1a21932f54b86a9824bf510d9a2a07aa058457b..2a5eb98c6e0f54f098c24ec09c68c3a4dda21aa8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -230,6 +230,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0557-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0557-Fix-interact-event-not-being-called-in-adventure.patch index a2e34830c9..4cdd5e9eaa 100644 --- a/patches/unapplied/server/0557-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/unapplied/server/0557-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 0a853329f7d3c0fe88dc033cd7d197a61ed590fc..4dc7697f5a6e14663211ebb1cbf1cd16a7436a7e 100644 +index 2a5eb98c6e0f54f098c24ec09c68c3a4dda21aa8..8b2c246f60886053beb9c4baf18c867910b9a8fd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1764,7 +1764,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0576-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0576-Collision-option-for-requiring-a-player-participant.patch index 7f229b27a8..450f927254 100644 --- a/patches/unapplied/server/0576-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/unapplied/server/0576-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 13fc7c21283f09fd135a12649776bb1355da4154..0bd01fb0582c27890fa94ed779103fa75472b482 100644 +index 96fd9803810db0f8a4b25e070a56da05862e1e4e..2b3e034d6cddbe5c94f2be856833680dd7b3b4f0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -115,6 +115,18 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0580-Configurable-max-leash-distance.patch b/patches/unapplied/server/0580-Configurable-max-leash-distance.patch index 497f5a6962..eda873aaf5 100644 --- a/patches/unapplied/server/0580-Configurable-max-leash-distance.patch +++ b/patches/unapplied/server/0580-Configurable-max-leash-distance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max leash distance diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0bd01fb0582c27890fa94ed779103fa75472b482..ede5c95818c6021d2317a9c7b181d0b6f1b4b7b7 100644 +index 2b3e034d6cddbe5c94f2be856833680dd7b3b4f0..9bb6b6c6ac26790eaf5f8efe55f8db7407fc0065 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -342,6 +342,12 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch index f47eff5e0a..4ff4147fe4 100644 --- a/patches/unapplied/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch +++ b/patches/unapplied/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for always placing the dragon egg diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ede5c95818c6021d2317a9c7b181d0b6f1b4b7b7..247d2d2c938394b4aa0d02c89ee2f7e68876ce3f 100644 +index 9bb6b6c6ac26790eaf5f8efe55f8db7407fc0065..1753a28e0dc001d55385cdf0d91edde23244d17b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -819,6 +819,11 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch index a50d41e3ae..1acd1a80e0 100644 --- a/patches/unapplied/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/unapplied/server/0589-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 247d2d2c938394b4aa0d02c89ee2f7e68876ce3f..09e8305cee635c1fb0b490de531eee79d9b15137 100644 +index 1753a28e0dc001d55385cdf0d91edde23244d17b..2eef459c0512122425db1374f59935b0bebfc754 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -824,6 +824,11 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0608-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0608-Allow-using-signs-inside-spawn-protection.patch index e17f5eea5e..1847997308 100644 --- a/patches/unapplied/server/0608-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/unapplied/server/0608-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 09e8305cee635c1fb0b490de531eee79d9b15137..cea095aae3f9ba4ed8be88282d48925ad667f0d9 100644 +index 2eef459c0512122425db1374f59935b0bebfc754..883c8d42c471eefe4ddf68196fac0d69428dbabd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -858,4 +858,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 09e8305cee635c1fb0b490de531eee79d9b15137..cea095aae3f9ba4ed8be88282d48925a + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4dc7697f5a6e14663211ebb1cbf1cd16a7436a7e..400c1bd9964a640a35146c7a80fae08de08be963 100644 +index 8b2c246f60886053beb9c4baf18c867910b9a8fd..62ed17858f8571f66c7605e2d5b447d774a53713 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1756,7 +1756,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 93858cb0ad..373d5a33b6 100644 --- a/patches/unapplied/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/unapplied/server/0616-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 400c1bd9964a640a35146c7a80fae08de08be963..36df32ae2edef09e6c544c4e93ef3e262aee5566 100644 +index 62ed17858f8571f66c7605e2d5b447d774a53713..f413cf714654f122a9533895d54dec524f2420ee 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1191,7 +1191,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0617-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0617-Entity-load-save-limit-per-chunk.patch index 0c7f0d5a03..97edbe15d8 100644 --- a/patches/unapplied/server/0617-Entity-load-save-limit-per-chunk.patch +++ b/patches/unapplied/server/0617-Entity-load-save-limit-per-chunk.patch @@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting limits for any entity type. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cea095aae3f9ba4ed8be88282d48925ad667f0d9..80840cd2d2c74e6778df2cd2082b5318e273ad3a 100644 +index 883c8d42c471eefe4ddf68196fac0d69428dbabd..ba95a27012bcba97d6e7f6a07d68a476c0beb96f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -8,6 +8,8 @@ import it.unimi.dsi.fastutil.objects.Reference2IntMap; diff --git a/patches/unapplied/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/unapplied/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch index 9b042cdd17..47d5930869 100644 --- a/patches/unapplied/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch +++ b/patches/unapplied/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 36df32ae2edef09e6c544c4e93ef3e262aee5566..7f73b6b63edefcf7fd4f5c7f15558af8b926f24e 100644 +index f413cf714654f122a9533895d54dec524f2420ee..bd40af954458ec9ff0ccbf30cb943a1b0a3054fa 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -771,12 +771,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0623-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0623-Set-area-affect-cloud-rotation.patch index b0f478a353..6989299f80 100644 --- a/patches/unapplied/server/0623-Set-area-affect-cloud-rotation.patch +++ b/patches/unapplied/server/0623-Set-area-affect-cloud-rotation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 9d247664e5867a31376b3681b7ed0c3404ea46d8..850131e601047ab1c585a6f8883ac3c0d0e97ba1 100644 +index cd359e6576e69184935b0852ffc6b9fb57181730..57b8c02dc8466dfc572719d72c9ff1fdefbbca4c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -894,6 +894,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/unapplied/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch index 2f2cac0cbd..ba21aeba41 100644 --- a/patches/unapplied/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/unapplied/server/0629-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 7f73b6b63edefcf7fd4f5c7f15558af8b926f24e..ad7bf4468956a840c39b3a52a115501b5479d192 100644 +index bd40af954458ec9ff0ccbf30cb943a1b0a3054fa..94829dd595147b2f251094835d9a7ba3b87484c0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1964,6 +1964,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch index 6e5395acef..b34c87b3a1 100644 --- a/patches/unapplied/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/unapplied/server/0636-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 ad7bf4468956a840c39b3a52a115501b5479d192..13a4db38552125f229f9fa09a893c88e895288c6 100644 +index 94829dd595147b2f251094835d9a7ba3b87484c0..f80a39acd2df8181523549d53664d7008638122d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2502,7 +2502,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0647-Add-basic-Datapack-API.patch b/patches/unapplied/server/0647-Add-basic-Datapack-API.patch index 4d2b21d203..faa046dc61 100644 --- a/patches/unapplied/server/0647-Add-basic-Datapack-API.patch +++ b/patches/unapplied/server/0647-Add-basic-Datapack-API.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b651a9d86a5b0e7ec2b10d2e756bbac4624f7f9c..52aaa4837423585e7f66790ca95ad7c0bdb30e4b 100644 +index 6fa21f806567bc41bacd2949d7171979bc34ac6e..90b0673411d33f46ac959c31f0608c489d41c3bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -281,6 +281,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0649-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0649-additions-to-PlayerGameModeChangeEvent.patch index e91ca1aa0a..010200c175 100644 --- a/patches/unapplied/server/0649-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/unapplied/server/0649-additions-to-PlayerGameModeChangeEvent.patch @@ -126,7 +126,7 @@ index f97d97426144527cff9ebb91b26fe8541a9c6d9b..b6eef41079120fffd63f06f681378b1b } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 13a4db38552125f229f9fa09a893c88e895288c6..bb9881c7e45bfa13f04f9779ec134fa349bd9133 100644 +index f80a39acd2df8181523549d53664d7008638122d..4f7cd9209cf6c352817591dd497c2e7ec6265ac6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2511,7 +2511,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0652-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0652-Fix-and-optimise-world-force-upgrading.patch index 571a37771d..d1c84bf761 100644 --- a/patches/unapplied/server/0652-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/unapplied/server/0652-Fix-and-optimise-world-force-upgrading.patch @@ -357,7 +357,7 @@ index 4bc33c31d497aa7d69226ab870fd78902bedfd5b..089e8414c7bdc102ba0d914af576df1a return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ())); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 52aaa4837423585e7f66790ca95ad7c0bdb30e4b..e4ba6c09f7d022c10cf8dba54ed122a797148473 100644 +index 90b0673411d33f46ac959c31f0608c489d41c3bb..20025b1e3c749ef3c164041e519a53b39a7a9b7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1199,12 +1199,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0659-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0659-Limit-item-frame-cursors-on-maps.patch index 0783d07b26..07aa4ead8a 100644 --- a/patches/unapplied/server/0659-Limit-item-frame-cursors-on-maps.patch +++ b/patches/unapplied/server/0659-Limit-item-frame-cursors-on-maps.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 80840cd2d2c74e6778df2cd2082b5318e273ad3a..a39819cef95fc70c5703b392afd5530ce6e3a622 100644 +index ba95a27012bcba97d6e7f6a07d68a476c0beb96f..b03c38b62b15b31477e22ba0ed45236ea8ee8970 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -897,4 +897,9 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0664-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0664-Add-option-to-fix-items-merging-through-walls.patch index dc7f43dcb6..bd8c0c97ea 100644 --- a/patches/unapplied/server/0664-Add-option-to-fix-items-merging-through-walls.patch +++ b/patches/unapplied/server/0664-Add-option-to-fix-items-merging-through-walls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a39819cef95fc70c5703b392afd5530ce6e3a622..306013994f397ba855acbd4e1aba791850b8d78b 100644 +index b03c38b62b15b31477e22ba0ed45236ea8ee8970..36f22f7a02341d16d69ce1c7e14cbe50a42f92ec 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -902,4 +902,9 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0666-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0666-Fix-invulnerable-end-crystals.patch index d07262ec1a..7473aa3e9e 100644 --- a/patches/unapplied/server/0666-Fix-invulnerable-end-crystals.patch +++ b/patches/unapplied/server/0666-Fix-invulnerable-end-crystals.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix invulnerable end crystals MC-108513 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 306013994f397ba855acbd4e1aba791850b8d78b..ccbd0bd60cbc1212d9683667ce4744350eda90bb 100644 +index 36f22f7a02341d16d69ce1c7e14cbe50a42f92ec..b68c2f46c7b595fe860f609b5681524ba310003e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -907,4 +907,9 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0671-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0671-Line-Of-Sight-Changes.patch index 1839562440..15b6f68f78 100644 --- a/patches/unapplied/server/0671-Line-Of-Sight-Changes.patch +++ b/patches/unapplied/server/0671-Line-Of-Sight-Changes.patch @@ -19,7 +19,7 @@ index b079f9cd9dd3c818b859010df74172a84eee544d..2e304d845878ff58a574c11dfa4424ba } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index b43fcdf2ab50f66f13d0e140375260d64c140f63..0b45a72fa6fac0f6bdd73ee16e7a7742c139c319 100644 +index 57b8c02dc8466dfc572719d72c9ff1fdefbbca4c..e996ffb6fd952208b1dabba8b470fd42f004919d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -919,5 +919,16 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/unapplied/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch index 8ee5e17d79..aae14ff74d 100644 --- a/patches/unapplied/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/unapplied/server/0677-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 62a006c1869118ed2fe5bc573c83f6398ff64167..b9c330f3c40ff8ee204e29d62e4a452dbe618f77 100644 +index 0a018328dfe2b73f962a1939786b9025ba0ebabe..f2be24d87cbd7aaaa518d0d1aab8652ed2493694 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1114,7 +1114,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0680-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0680-Fix-commands-from-signs-not-firing-command-events.patch index 7ffd1bd492..aadb66333e 100644 --- a/patches/unapplied/server/0680-Fix-commands-from-signs-not-firing-command-events.patch +++ b/patches/unapplied/server/0680-Fix-commands-from-signs-not-firing-command-events.patch @@ -10,7 +10,7 @@ This patch changes sign command logic so that `run_command` click events: - sends failure messages to the player who clicked the sign diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1f74b1b2fc9ecfbb83710665ef0171886eab0097..c651c8750f357883c6e92b6a19e087090c4b324a 100644 +index 1ae2e1599cb5b8612ca5b45c37367377d7f26dbf..0731dcc367b621b18c2435db053645e9f9af2a80 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -932,4 +932,9 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0681-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0681-Adds-PlayerArmSwingEvent.patch index b6f0d0c7f7..fba4acb3c8 100644 --- a/patches/unapplied/server/0681-Adds-PlayerArmSwingEvent.patch +++ b/patches/unapplied/server/0681-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 b9c330f3c40ff8ee204e29d62e4a452dbe618f77..49f5596ba647ce4ec310880f0091e78735099980 100644 +index f2be24d87cbd7aaaa518d0d1aab8652ed2493694..62c429b2df9b0d5dc8dbd867f60f9b6cdfb9532c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2262,7 +2262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch index f840eab7dd..e50e1844b7 100644 --- a/patches/unapplied/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/unapplied/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch @@ -17,7 +17,7 @@ index b88728889c2ebfc44bfa5032b1629817b4e7b45d..b49dd352f6d8d27ab97fd0d69cf40010 public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 49f5596ba647ce4ec310880f0091e78735099980..62e24f0314689c14dad5fb216f110b48addb5da2 100644 +index 62c429b2df9b0d5dc8dbd867f60f9b6cdfb9532c..d23ebb6ee187eaa657fd6fa255f66b4095090b6d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -447,7 +447,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0683-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0683-Add-config-for-mobs-immune-to-default-effects.patch index 6819100ad9..5483a9c802 100644 --- a/patches/unapplied/server/0683-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/unapplied/server/0683-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c651c8750f357883c6e92b6a19e087090c4b324a..f7ce18d165733329e7c656885cf5ed1b06d35a47 100644 +index 0731dcc367b621b18c2435db053645e9f9af2a80..b7d30804bfd4f9a2f379f5b77dcb6ae7446a76e9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -730,6 +730,21 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0685-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0685-Don-t-apply-cramming-damage-to-players.patch index 8aa843ef04..73b6758c48 100644 --- a/patches/unapplied/server/0685-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/unapplied/server/0685-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f7ce18d165733329e7c656885cf5ed1b06d35a47..40b3c6ef824e96747d3c01129e4dbaaaa3d3613a 100644 +index b7d30804bfd4f9a2f379f5b77dcb6ae7446a76e9..b05b400dbee7963c48478368bd4950f2910b69bc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -952,4 +952,9 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0690-Add-System.out-err-catcher.patch b/patches/unapplied/server/0690-Add-System.out-err-catcher.patch index ead4fa2a9f..4e515147b7 100644 --- a/patches/unapplied/server/0690-Add-System.out-err-catcher.patch +++ b/patches/unapplied/server/0690-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e4ba6c09f7d022c10cf8dba54ed122a797148473..674154ae0ceb8da37e41be69179b546ab2872be5 100644 +index 20025b1e3c749ef3c164041e519a53b39a7a9b7d..538e5663e7e23a1bcc2c832930d4c1489a48c07a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -283,6 +283,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch index 8fb3104810..15e336fb70 100644 --- a/patches/unapplied/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/unapplied/server/0694-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 62e24f0314689c14dad5fb216f110b48addb5da2..4688a91fe7cee4e7c3c1d27a5f5db592bbfe1a30 100644 +index d23ebb6ee187eaa657fd6fa255f66b4095090b6d..eeb21a890480f5cae2a25a4af215bd56778b83e5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -387,7 +387,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0699-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0699-Config-option-for-Piglins-guarding-chests.patch index f82305427c..e845691e3b 100644 --- a/patches/unapplied/server/0699-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/unapplied/server/0699-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3dc62c72e9d3db93d3e118814cfada6c275b8e3f..68982f44fac2a3da621503cffb7921498a6f8666 100644 +index d1a00ef7ef9ffe4f474ce3d5513df912faacf871..ebc8ffcf19a1eb8e1e318df3aca6cc80beacb16f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -82,6 +82,11 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0703-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0703-Configurable-item-frame-map-cursor-update-interval.patch index bbfd95a3a8..23e25ed83c 100644 --- a/patches/unapplied/server/0703-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/unapplied/server/0703-Configurable-item-frame-map-cursor-update-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 68982f44fac2a3da621503cffb7921498a6f8666..4b84f633e647db439ad9390b963de6af543c8d83 100644 +index ebc8ffcf19a1eb8e1e318df3aca6cc80beacb16f..a3e25ebe096a687de0b63f9618c49198ebea2074 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -945,6 +945,11 @@ public class PaperWorldConfig { diff --git a/patches/unapplied/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 181bb7eeae..cbcf450be8 100644 --- a/patches/unapplied/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/unapplied/server/0776-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 4688a91fe7cee4e7c3c1d27a5f5db592bbfe1a30..f15e4b72264c4ee3d7dc758307963a528fa84ef6 100644 +index eeb21a890480f5cae2a25a4af215bd56778b83e5..6d1e3104750b23e9d4b0ddea35e1241f8434a1ac 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -770,6 +770,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch index ab4dd3ccd0..49935cca9f 100644 --- a/patches/unapplied/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/unapplied/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c0427bfe4f93b501aaacb66c131d2736dce6b5e0..825a3b688099a3021ff422dd123038b6cca3e14f 100644 +index 83bbe0e65760a7f380e19da5a3938b1a30e5d679..8769e15a395b1c6e72f3e4a7f96b8c90c34e7569 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2317,6 +2317,90 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch index 6bb3a43baa..bf41fd9f24 100644 --- a/patches/unapplied/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/unapplied/server/0809-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 f15e4b72264c4ee3d7dc758307963a528fa84ef6..a0766375eb8dde3b04a01dbca535a4b08a5d6abc 100644 +index 6d1e3104750b23e9d4b0ddea35e1241f8434a1ac..1a15711e657c93965c2839dc130b7c53d86482b0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -587,7 +587,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0840-Kick-on-main-for-illegal-chars.patch b/patches/unapplied/server/0840-Kick-on-main-for-illegal-chars.patch index a41c08fba8..32ddbfda7e 100644 --- a/patches/unapplied/server/0840-Kick-on-main-for-illegal-chars.patch +++ b/patches/unapplied/server/0840-Kick-on-main-for-illegal-chars.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Kick on main for illegal chars diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a0766375eb8dde3b04a01dbca535a4b08a5d6abc..f587a2c208dee26b2146a2dbe343e6bf39ec11e5 100644 +index 1a15711e657c93965c2839dc130b7c53d86482b0..b42d4224d7f5c5de7e9fa8d6278af10f84d81245 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2081,7 +2081,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch index 0b8985beaf..c6327b78cf 100644 --- a/patches/unapplied/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/unapplied/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch @@ -123,7 +123,7 @@ index 0000000000000000000000000000000000000000..ed3d488c6581df5eac425d9cccb8e741 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 168893fe1790edac8fee884b1fae4e6b7a1bd5c6..231a7935950d40683c8538bfcfc8adea236ad37a 100644 +index b4133f8dde5edb75b8d2d1008c50db7810276913..d9bfdeba8eaa8ab750b5037ff3d3a82a445adc2d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1988,6 +1988,13 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index d1c68efe88..85b0ad1a52 100644 --- a/patches/unapplied/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/unapplied/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 231a7935950d40683c8538bfcfc8adea236ad37a..6ce8e229eabcc021a01c1c29c39091858b598e39 100644 +index d9bfdeba8eaa8ab750b5037ff3d3a82a445adc2d..fbd4ecab83955c3c56fa076da12b28399641bd50 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2157,6 +2157,8 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0853-Add-GameEvent-tags.patch b/patches/unapplied/server/0853-Add-GameEvent-tags.patch index 485afd2e69..1a4217790e 100644 --- a/patches/unapplied/server/0853-Add-GameEvent-tags.patch +++ b/patches/unapplied/server/0853-Add-GameEvent-tags.patch @@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6ce8e229eabcc021a01c1c29c39091858b598e39..aea07b7b9cbee6198f69fabd32e901d5952687a0 100644 +index fbd4ecab83955c3c56fa076da12b28399641bd50..2e0517aa65102af5c7aef08acbc25646b1a0afd8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -97,6 +97,7 @@ import net.minecraft.world.level.biome.BiomeSource; diff --git a/patches/unapplied/server/0861-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0861-Put-world-into-worldlist-before-initing-the-world.patch index 03d29b4b5a..3c4e5271a9 100644 --- a/patches/unapplied/server/0861-Put-world-into-worldlist-before-initing-the-world.patch +++ b/patches/unapplied/server/0861-Put-world-into-worldlist-before-initing-the-world.patch @@ -23,7 +23,7 @@ index 443fb9cdce8bf542ca6216aa65c3e48c66dde654..e4461fb3485391ec0a9d902d5b896bb9 if (worlddata.getCustomBossEvents() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index aea07b7b9cbee6198f69fabd32e901d5952687a0..19973165c7aa918c072db869c979d395895546d5 100644 +index 2e0517aa65102af5c7aef08acbc25646b1a0afd8..810986cc3b349a66c02f2a682daac8b4422917ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1255,10 +1255,11 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0863-Custom-Potion-Mixes.patch b/patches/unapplied/server/0863-Custom-Potion-Mixes.patch index be00e9e97f..2d9284dba0 100644 --- a/patches/unapplied/server/0863-Custom-Potion-Mixes.patch +++ b/patches/unapplied/server/0863-Custom-Potion-Mixes.patch @@ -164,7 +164,7 @@ index 287205bce7f655f9a6b815f40d349c3db4c1e788..5c0f1488c8a8100cd39a03adeccded99 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 19973165c7aa918c072db869c979d395895546d5..776b2b0ab9942282d9c8cb5ba8e86e257cee90b9 100644 +index 810986cc3b349a66c02f2a682daac8b4422917ae..6333688c49b8c9dd2476634ad3968b468b3d5147 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -285,6 +285,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0867-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0867-Fix-falling-block-spawn-methods.patch index ec50973594..e056543550 100644 --- a/patches/unapplied/server/0867-Fix-falling-block-spawn-methods.patch +++ b/patches/unapplied/server/0867-Fix-falling-block-spawn-methods.patch @@ -8,7 +8,7 @@ Restores the API behavior from previous versions of the server - Do not replace the existing block in the world diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index ca080cbc219605331dc8a0d7e8366de02c1d2ced..dc05818c17ad9ac67ef6b4783acdbb0bcceacba3 100644 +index e996ffb6fd952208b1dabba8b470fd42f004919d..6e827ed6212915b187e4c610acf6c34037c9c994 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -549,7 +549,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/unapplied/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch index e3547442b3..c5c5cd77ae 100644 --- a/patches/unapplied/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/unapplied/server/0873-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 f587a2c208dee26b2146a2dbe343e6bf39ec11e5..255f1a4e702d8c31113fed91f5295201102bda98 100644 +index b42d4224d7f5c5de7e9fa8d6278af10f84d81245..3bfd0fc8e2d068657183e4ebd4f632c94c3908b2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -517,6 +517,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0874-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0874-Implement-getComputedBiome-API.patch index b3053d8904..67a703ae71 100644 --- a/patches/unapplied/server/0874-Implement-getComputedBiome-API.patch +++ b/patches/unapplied/server/0874-Implement-getComputedBiome-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 99cb7625d50d5da4ce0999e10fb84403958a7ffe..e231636403a70f28e7e4bf51542608872234ce94 100644 +index 6e827ed6212915b187e4c610acf6c34037c9c994..81a2a4f9ca0cb94cfd0680f57be4157dfb2fff57 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -204,6 +204,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/unapplied/server/0878-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0878-Fix-saving-in-unloadWorld.patch index f5525c7ec0..594e2a1fcc 100644 --- a/patches/unapplied/server/0878-Fix-saving-in-unloadWorld.patch +++ b/patches/unapplied/server/0878-Fix-saving-in-unloadWorld.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 776b2b0ab9942282d9c8cb5ba8e86e257cee90b9..32e13232c0c1c52486db469c1661e3473e6f0f5e 100644 +index 6333688c49b8c9dd2476634ad3968b468b3d5147..12c1728084d5f1af2a0c242b271939198c7fbea5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1303,7 +1303,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0889-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0889-Prevent-tile-entity-copies-loading-chunks.patch index 75edbf32e1..f888d77e2f 100644 --- a/patches/unapplied/server/0889-Prevent-tile-entity-copies-loading-chunks.patch +++ b/patches/unapplied/server/0889-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 255f1a4e702d8c31113fed91f5295201102bda98..c75a3b42272776ef2a2b516555c723c1913c8bf9 100644 +index 3bfd0fc8e2d068657183e4ebd4f632c94c3908b2..4e3ee857b7c328d857aee8ff066758b19ef81da2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2995,7 +2995,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/unapplied/server/0894-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0894-WorldCreator-keepSpawnLoaded.patch index c615ee73a2..5881ed10a8 100644 --- a/patches/unapplied/server/0894-WorldCreator-keepSpawnLoaded.patch +++ b/patches/unapplied/server/0894-WorldCreator-keepSpawnLoaded.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 32e13232c0c1c52486db469c1661e3473e6f0f5e..ab843069ac0653d03cf3f925f49555016cad84fa 100644 +index 12c1728084d5f1af2a0c242b271939198c7fbea5..c3f15ee7505e82418d9659ba3cee4f807546e0db 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1262,6 +1262,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0903-Don-t-tick-markers.patch b/patches/unapplied/server/0903-Don-t-tick-markers.patch index f11e75fc18..3e7bee7718 100644 --- a/patches/unapplied/server/0903-Don-t-tick-markers.patch +++ b/patches/unapplied/server/0903-Don-t-tick-markers.patch @@ -9,7 +9,7 @@ list is only used in the tick and tickPassenger methods, so we can safely not ad markers to it. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 0bb69361e42dc1e33907d3415b6c6d48f0b38742..920f25c9c25d24683040d259c6c4e6ed5b2689a5 100644 +index 5f079cf06b0d1505bfb3fda5c326b2d7fd4f0e48..febb35091d32735ae2fe846170bd2c46d1449723 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -629,7 +629,7 @@ public class PaperCommand extends Command { diff --git a/patches/unapplied/server/0905-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0905-Do-not-accept-invalid-client-settings.patch index a370d820c1..400960b04a 100644 --- a/patches/unapplied/server/0905-Do-not-accept-invalid-client-settings.patch +++ b/patches/unapplied/server/0905-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 0545c7fb227665dd23c7b5034a1520ed10f962b9..901fa17d0f0a3f66923f68f13f183bc4c17f7748 100644 +index 1169149f0316e683ba5ac3b1e95a8a00a3c2dafa..0b7923f67d27549f41c0d398d1b99737f0c8a746 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3170,6 +3170,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser