diff --git a/patches/unapplied/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch similarity index 93% rename from patches/unapplied/server/0002-Remap-fixes.patch rename to patches/server/0002-Remap-fixes.patch index dc9145fd2d..2e453ea204 100644 --- a/patches/unapplied/server/0002-Remap-fixes.patch +++ b/patches/server/0002-Remap-fixes.patch @@ -61,18 +61,18 @@ index 3ba785845a63e46a44fc48264d08c96bfc34ab8b..92bd58010e8c89e361e28aec59447349 entityliving1 = entityliving2; } else { diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -index b402543da876e6d14b263443b2d692f33eb08863..4d2d23ff118e9307d50ca2a5194b83450c91a752 100644 +index 7918deb55e6ed2e16eba501ab380a456270d9512..a81475d0cd3c5b75b4abe0d1a01389372a4d9ab1 100644 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -@@ -192,7 +192,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { - Builder> builder = ImmutableMap.builder(); +@@ -197,7 +197,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { + Builder> builder = ImmutableMap.builder(); - recipes.forEach((irecipe) -> { -- Map> map1 = (Map) map.computeIfAbsent(irecipe.getType(), (recipes) -> { -+ Map> map1 = (Map) map.computeIfAbsent(irecipe.getType(), (recipes_) -> { // Paper - remap fix + recipes.forEach((recipeholder) -> { +- Map> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes) -> { ++ Map> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes_) -> { // Paper - remap fix return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit }); - ResourceLocation minecraftkey = irecipe.getId(); + ResourceLocation minecraftkey = recipeholder.id(); diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java index ad52c3fc6210939a39ef77a382c640a24ee44838..6b7dd01778f0a5d3a96d2d04af4b525d17efbfba 100644 --- a/src/test/java/org/bukkit/DyeColorsTest.java diff --git a/patches/unapplied/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch similarity index 90% rename from patches/unapplied/server/0003-Build-system-changes.patch rename to patches/server/0003-Build-system-changes.patch index bfaef8e1d6..b2cf06f23e 100644 --- a/patches/unapplied/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -9,7 +9,7 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/ Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 3ec94658ddd0c2f7b3716742c247656d9c7c8866..b1c84b847f8845407eafc89d8b027b34cc6a95b8 100644 +index 91a5d6e9775010336da28ed6e2f6654b0f7248f6..32d475a636d4ba90eeaecfac148143f940cba6e2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,10 +9,9 @@ plugins { @@ -23,8 +23,8 @@ index 3ec94658ddd0c2f7b3716742c247656d9c7c8866..b1c84b847f8845407eafc89d8b027b34 implementation("org.ow2.asm:asm:9.5") + implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.1.0") @@ -23,6 +22,8 @@ dependencies { testImplementation("junit:junit:4.13.2") @@ -33,7 +33,7 @@ index 3ec94658ddd0c2f7b3716742c247656d9c7c8866..b1c84b847f8845407eafc89d8b027b34 + implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty } - val craftbukkitPackageVersion = "1_20_R1" // Paper + val craftbukkitPackageVersion = "1_20_R2" // Paper @@ -34,6 +35,7 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" @@ -99,7 +99,7 @@ index 3ec94658ddd0c2f7b3716742c247656d9c7c8866..b1c84b847f8845407eafc89d8b027b34 + jvmArgs("-DPaper.isRunDev=true") } diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java -index 6eb213981aeb7e75e1ed75f1483bc98187726f6f..de37a6e2edf36107a04b3707b9c5bbd608fcab20 100644 +index 68e3d54c79924d72b22eb3bc142ff47aa1700895..d3300e43523429fdd0e61c5aa9aed2e6bc78e07e 100644 --- a/src/main/java/net/minecraft/resources/ResourceLocation.java +++ b/src/main/java/net/minecraft/resources/ResourceLocation.java @@ -26,6 +26,7 @@ public class ResourceLocation implements Comparable { @@ -111,10 +111,10 @@ index 6eb213981aeb7e75e1ed75f1483bc98187726f6f..de37a6e2edf36107a04b3707b9c5bbd6 private final String path; diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index e7240acad17dc9c0d93f2792cc0d90c1855ac436..ba96530f00faa1d113a14242eb8192349c7c944f 100644 +index 84dab998d5b91b9c5690e9e086b17a60b6dec058..2ac60ea28ce722cdef61cfdc69bbbdf391628238 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -110,6 +110,17 @@ public class Main { +@@ -107,6 +107,17 @@ public class Main { */ // CraftBukkit end try { @@ -133,20 +133,20 @@ index e7240acad17dc9c0d93f2792cc0d90c1855ac436..ba96530f00faa1d113a14242eb819234 Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java -index 03bf7dfc289c6a02f19678d3c7041c027154b99d..43ce85977472fd831fa272ff1d81df4586352d72 100644 +index 7db49f077704f03d1815f8382523199bd6c9a0dc..4ed8f38ba9c7b075b99a0da0e213a1e9d03ac717 100644 --- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java +++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java -@@ -28,7 +28,7 @@ public class ServerPacksSource extends BuiltInPackSource { - } +@@ -32,7 +32,7 @@ public class ServerPacksSource extends BuiltInPackSource { - private static VanillaPackResources createVanillaPackSource() { + @VisibleForTesting + public static VanillaPackResources createVanillaPackSource() { - return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft").applyDevelopmentConfig().pushJarResources().build(); + return (new VanillaPackResourcesBuilder()).setMetadata(BUILT_IN_METADATA).exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE).applyDevelopmentConfig().pushJarResources().build(); // Paper } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index e325cb56f2bafce21ce06bb5c674837abbb676e7..8a30ebbac91a0750c00ebbcb5372e6d2a45c064a 100644 +index bf691570a019d4c1e2affceb7b707b65e943345b..541aa0cd6c89a6df8e4244aaea7a610cf7200e54 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -209,7 +209,7 @@ public class Main { @@ -157,7 +157,7 @@ index e325cb56f2bafce21ce06bb5c674837abbb676e7..8a30ebbac91a0750c00ebbcb5372e6d2 + Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -21); + deadline.add(Calendar.DAY_OF_YEAR, -3); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/patches/unapplied/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch similarity index 97% rename from patches/unapplied/server/0004-Test-changes.patch rename to patches/server/0004-Test-changes.patch index 1ae99d462a..945748fc61 100644 --- a/patches/unapplied/server/0004-Test-changes.patch +++ b/patches/server/0004-Test-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Test changes diff --git a/build.gradle.kts b/build.gradle.kts -index b1c84b847f8845407eafc89d8b027b34cc6a95b8..784a2ae459d4a6afd6773d2298838c07c9152250 100644 +index 32d475a636d4ba90eeaecfac148143f940cba6e2..b6f741435b7c63d748b79669d3d8f420db52c3a7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { @@ -14,8 +14,8 @@ index b1c84b847f8845407eafc89d8b027b34cc6a95b8..784a2ae459d4a6afd6773d2298838c07 implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation + testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.1.0") diff --git a/src/test/java/io/papermc/paper/testing/DummyServer.java b/src/test/java/io/papermc/paper/testing/DummyServer.java new file mode 100644 index 0000000000000000000000000000000000000000..e944e9dca13883c57e93e480ae5adfe51c342532 @@ -126,7 +126,7 @@ index 0000000000000000000000000000000000000000..c88749e839ee1a9cf8439c4218c8a98a + } +} diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java -index 4f392c199fc31808d339659156f2e9b229e755e2..453e2189b842a6f6f52186578af1ee2e2fcba2e4 100644 +index 7e665ec6bdf394b98d17687afdb8af9a7a6b0e0f..31d3a6967f509286bcfe1cf55d1a3dc637927e55 100644 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java @@ -54,6 +54,7 @@ public abstract class AbstractTestingBase { diff --git a/patches/unapplied/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch similarity index 99% rename from patches/unapplied/server/0005-Paper-config-files.patch rename to patches/server/0005-Paper-config-files.patch index 54392d9193..76904c3a8f 100644 --- a/patches/unapplied/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -14,7 +14,7 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES diff --git a/build.gradle.kts b/build.gradle.kts -index 784a2ae459d4a6afd6773d2298838c07c9152250..b60a9ab80589eb8a3e9ece76c7eb24cd3d6dbe96 100644 +index b6f741435b7c63d748b79669d3d8f420db52c3a7..ba38153a37e864ab7f02a169da3df8806122aa76 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { @@ -23,8 +23,8 @@ index 784a2ae459d4a6afd6773d2298838c07c9152250..b60a9ab80589eb8a3e9ece76c7eb24cd testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito + implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") - runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.1.0") diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..ef41cf3a7d1e6f2bfe81e0fb865d2f969bbc77c1 @@ -4567,10 +4567,10 @@ index 0000000000000000000000000000000000000000..70cc7b45e7355f6c8476a74a070f1266 + } +} diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index ba96530f00faa1d113a14242eb8192349c7c944f..ac59339d9ed4b0860de7d338e5b7610175e27165 100644 +index 2ac60ea28ce722cdef61cfdc69bbbdf391628238..9cfdd5d8c1650d9c9bdfbc07980239e507ff942d 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -142,6 +142,10 @@ public class Main { +@@ -139,6 +139,10 @@ public class Main { dedicatedserversettings.forceSave(); Path path2 = Paths.get("eula.txt"); Eula eula = new Eula(path2); @@ -4581,7 +4581,7 @@ index ba96530f00faa1d113a14242eb8192349c7c944f..ac59339d9ed4b0860de7d338e5b76101 if (optionset.has("initSettings")) { // CraftBukkit // CraftBukkit start - SPIGOT-5761: Create bukkit.yml and commands.yml if not present -@@ -176,7 +180,7 @@ public class Main { +@@ -173,7 +177,7 @@ public class Main { } File file = (File) optionset.valueOf("universe"); // CraftBukkit @@ -4591,10 +4591,10 @@ index ba96530f00faa1d113a14242eb8192349c7c944f..ac59339d9ed4b0860de7d338e5b76101 String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName); LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath()); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 60e683ac0adaa192c502d059f6e448d0a23e8a09..6877a10fe56b46cf3fb7ccccf5a55e57d03048e9 100644 +index bc4f2e0a7086825ba8d1a503a65a4375d6c90d72..1561b26e1b4115f4d5631f20b31c2238d1d23202 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -384,6 +385,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Hash.Strategy identityStrategy() { @@ -40,10 +40,10 @@ index e89fa618fa20e3e843d8de81629e6dc551777823..2bb5e51f71cbf66819d198505aa4a5ec } }; diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java -index fe671ee23a5d364e20571dede6fc6bca7d83e98c..baa88201c4d08fb4f32f1198e187d7ca138b0f0e 100644 +index 1dfcb02b4f576e7f259a3726e0d2a48b7a76c569..bdd3b48e5de2afd6b7655ba6ff742a60ee9540c5 100644 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java -@@ -314,7 +314,7 @@ public class BuiltInRegistries { +@@ -318,7 +318,7 @@ public class BuiltInRegistries { LOADERS.put(resourceLocation, () -> { return initializer.run(registry); }); @@ -52,24 +52,11 @@ index fe671ee23a5d364e20571dede6fc6bca7d83e98c..baa88201c4d08fb4f32f1198e187d7ca return registry; } -diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java -index c4c1fc4e082d4d35327735e0704ada4e96195db2..a30fa3d54b70ab63d24dd67a69f39742335aff1e 100644 ---- a/src/main/java/net/minecraft/network/ConnectionProtocol.java -+++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java -@@ -335,7 +335,7 @@ public enum ConnectionProtocol implements BundlerInfo.Provider { - - public void listAllPackets(Consumer>> consumer) { - this.classToId.keySet().stream().filter((type) -> { -- return type != BundleDelimiterPacket.class; -+ return !type.equals(BundleDelimiterPacket.class); // Paper - fix of some kind - }).forEach(consumer); - this.extraClasses.forEach(consumer); - } diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java -index 9ff8afe750bc469c11c70b2f44c8a78887a8cd00..ea30dad0134644a8ad292a892450404203f3535e 100644 +index 13c8051da164bed579fbda44af059a36b8f00a0e..b6506e881ef337bfd2a7a0644296b48b7300a0f6 100644 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java +++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java -@@ -138,9 +138,8 @@ public class ComponentUtils { +@@ -129,9 +129,8 @@ public class ComponentUtils { ComponentContents string = text.getContents(); if (string instanceof TranslatableContents) { TranslatableContents translatableContents = (TranslatableContents)string; @@ -94,7 +81,7 @@ index 41d6569c00db3d467f6e90d33ebd261529b89f4c..5f051cb22ae77f4d8994b07ac5b963bd }; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6877a10fe56b46cf3fb7ccccf5a55e57d03048e9..8c7d762219e848387b153fb50553b7de58bc9627 100644 +index 1561b26e1b4115f4d5631f20b31c2238d1d23202..124fad1031d6125bca233541e2d5f256da70ca44 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1774,7 +1774,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop SortedArraySet create(Comparator comparator) { diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index d6e25c7f5dc6c219e2590aa8b1ffd51a2120d50e..40cdff9eaa1e78e02060d970e477d96f960cfed3 100644 +index ff5c0d5a7dd263869ba1eb93f2e81e8c6de42f26..869f60e9407ed1c5bee536ef91a21f4d11f8f964 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -@@ -151,7 +151,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider +@@ -148,7 +148,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl @Override protected void customServerAiStep() { this.level().getProfiler().push("camelBrain"); @@ -146,10 +133,10 @@ index d6e25c7f5dc6c219e2590aa8b1ffd51a2120d50e..40cdff9eaa1e78e02060d970e477d96f this.level().getProfiler().pop(); this.level().getProfiler().push("camelActivityUpdate"); diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java -index e8da5e51449d908de492b55dfa21e8d1108514fa..22eb0a8fc35baa04b34265b62aa29a71f3cc7343 100644 +index 92c1966d8f64ff308bb73cea3e7a9cdf9cf350d5..7d1e6427ab5f2dabe9072d092d733b0ff34e0b44 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java -@@ -99,7 +99,7 @@ public class Frog extends Animal implements VariantHolder { +@@ -101,7 +101,7 @@ public class Frog extends Animal implements VariantHolder { @Override public Brain getBrain() { @@ -159,10 +146,10 @@ index e8da5e51449d908de492b55dfa21e8d1108514fa..22eb0a8fc35baa04b34265b62aa29a71 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 555b52e2d9a6d4db7a527cda46ba6acf711da697..98c41e87b644f79ebfd45af2e0d7b887a3f5d00b 100644 +index 9799f693dc08cdfc2974959fc792ba86c5c51ceb..7bcd5498c734873b74bee503992ec4806ae61df7 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -@@ -123,7 +123,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { +@@ -125,7 +125,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @Override public Brain getBrain() { @@ -172,10 +159,10 @@ index 555b52e2d9a6d4db7a527cda46ba6acf711da697..98c41e87b644f79ebfd45af2e0d7b887 @Override diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -index 4d2d23ff118e9307d50ca2a5194b83450c91a752..ab6dc3449a1d3b7acf1d7bf5ac1c24224cc252c7 100644 +index a81475d0cd3c5b75b4abe0d1a01389372a4d9ab1..bf16c44e2d61dccb662eceeef89a143a25ba40b0 100644 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java +++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java -@@ -78,7 +78,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { +@@ -81,7 +81,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { } this.recipes = (Map) map1.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry1) -> { @@ -219,10 +206,10 @@ index db48010e633165972d2eac339dd7d1fd5a2f5bd8..d818d3ea6d28aa6ffb62127d4efd585d } } diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index b445f90b70d5a74f5bdc1b081500da4742e1c093..afba733824d84d650e669eda028bf4d28cf006b4 100644 +index 9fbe8ef3fea77ecbbc8689cc6472d0d5f30b7166..b8fb6d1d85e07f5165bfaf7d80807e069b595851 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -@@ -56,7 +56,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -57,7 +57,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer } private static > Codec codec(IdMap idList, Codec entryCodec, PalettedContainer.Strategy provider, T defaultValue, PalettedContainerRO.Unpacker reader) { diff --git a/patches/unapplied/server/0007-ConcurrentUtil.patch b/patches/server/0007-ConcurrentUtil.patch similarity index 100% rename from patches/unapplied/server/0007-ConcurrentUtil.patch rename to patches/server/0007-ConcurrentUtil.patch diff --git a/patches/unapplied/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch similarity index 93% rename from patches/unapplied/server/0008-CB-fixes.patch rename to patches/server/0008-CB-fixes.patch index db545005be..91e27248d7 100644 --- a/patches/unapplied/server/0008-CB-fixes.patch +++ b/patches/server/0008-CB-fixes.patch @@ -17,10 +17,10 @@ Subject: [PATCH] CB fixes Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 82435da47f0f7db73556310f84dc538a7c5f0809..ebae711991a3ae35e35c2cffa8d928677c205492 100644 +index f3a41559be5ad0b40762d368d8582704c8305961..32565740c6b013d9ad644e7c62d6721bdbd15b10 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -298,7 +298,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -294,7 +294,7 @@ public class ServerLevel extends Level implements WorldGenLevel { long l = minecraftserver.getWorldData().worldGenOptions().seed(); @@ -30,10 +30,10 @@ index 82435da47f0f7db73556310f84dc538a7c5f0809..ebae711991a3ae35e35c2cffa8d92867 if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 40cdff9eaa1e78e02060d970e477d96f960cfed3..c853123c451c41beb42209c7edc14a5dcffa2a50 100644 +index 869f60e9407ed1c5bee536ef91a21f4d11f8f964..3aa98f7c282cb4884589cb83b1546b924e66f096 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -@@ -446,9 +446,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider +@@ -445,9 +445,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl } @Override @@ -68,10 +68,10 @@ index 161ad6ab1443b2ce33a2d7d91d189c855db0453b..15a9736a870055d639d03063c7cf67fd this.registryAccess = registryManager; this.structureTemplateManager = structureTemplateManager; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 34209c5f4465eadb095336d8023739e6f0f2785b..c9bbe1d3a44cea1860f0ecba9580fe8ee87f6929 100644 +index cbfc9b90805ecce074d42cfeb0b68d84cdafcac6..35f0be0afad8f88f69c3127d1bd44bb0e12af550 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2357,7 +2357,13 @@ public final class CraftServer implements Server { +@@ -2360,7 +2360,13 @@ public final class CraftServer implements Server { Preconditions.checkArgument(key != null, "NamespacedKey key cannot be null"); LootDataManager registry = this.getServer().getLootData(); diff --git a/patches/unapplied/server/0009-MC-Utils.patch b/patches/unapplied/server/0009-MC-Utils.patch index 7c78ffeef9..597ed4c2f6 100644 --- a/patches/unapplied/server/0009-MC-Utils.patch +++ b/patches/unapplied/server/0009-MC-Utils.patch @@ -6686,7 +6686,7 @@ index d6d16f54ed22f8bc025ab6a5c7bd998ec1a44145..861f366e05af1c2bf5bbc8a4e752e3fb @Override public float getBukkitYaw() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 7224ab24ea0e5806665ee1355b3d1ce64123fd29..c2c2c24a593f67abc1eec4a20ced1ec0b5fa8cad 100644 +index 0762cdf228b8abc69125485a446d16e9482fdca2..fd7a381d6fc9436f06b5a3e3508b8a4a0f4ece66 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -275,6 +275,7 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0012-Paper-Metrics.patch b/patches/unapplied/server/0012-Paper-Metrics.patch index 56030b185b..a965df72cc 100644 --- a/patches/unapplied/server/0012-Paper-Metrics.patch +++ b/patches/unapplied/server/0012-Paper-Metrics.patch @@ -698,7 +698,7 @@ index 0000000000000000000000000000000000000000..6aaed8e8bf8c721fc834da5c76ac72a4 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index a01d423f44b3e547b4fa4d6654f9df636d69525f..59eed41e1c6012650597f1faa85063a2d536873f 100644 +index 8bce21e0d3e4ca18dcd43f9ab61387a012a5f24f..cfc4cad33d36e720f32b7ad6d1d4b3983f7aad39 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -187,6 +187,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index c156c1e31f..1985235f5b 100644 --- a/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow nerfed mobs to jump and take water damage diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index c2c2c24a593f67abc1eec4a20ced1ec0b5fa8cad..b3de20af553414369784b17139dd9185cc715db2 100644 +index fd7a381d6fc9436f06b5a3e3508b8a4a0f4ece66..672e78e3e9e2e53a10ad3ada895cb1bc1c324b54 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -109,6 +109,7 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch index 64f9c2e628..b8b098bfa8 100644 --- a/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable despawn distances for living entities diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index b3de20af553414369784b17139dd9185cc715db2..9e17033b801676f9db7739bd2ed710744f42defd 100644 +index 672e78e3e9e2e53a10ad3ada895cb1bc1c324b54..2acc00d8afe07b4d16abb831e4ddc8f454beec4e 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -844,14 +844,14 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 21f3c95d59..c49243de63 100644 --- a/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -19,7 +19,7 @@ index f46ae930c6d1609dbefb56e67853f6e8504b749f..787f32156b02063adf6426b7430da4c4 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 2d0d6dbcb515de0d81079a1d6b68c9b2bd973893..d5731088df47fa49e3248dfbcd755de7cd91efbd 100644 +index 3704952279358e0a047ce1dccf2d3ef259b33ff1..d4cbe1f06be41c5e54a696898c26a5e499e3ff80 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -263,7 +263,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; @@ -32,7 +32,7 @@ index 2d0d6dbcb515de0d81079a1d6b68c9b2bd973893..d5731088df47fa49e3248dfbcd755de7 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ff955d3a20bf953770cc81f8b89a6d4425a5f813..268192b06592eaa56a454e0f02b2d848f766d9ac 100644 +index 6aeb5c145ea26243abda693e81014f73c6abfb56..e45fabbf0a7fe125c1b4f82894a177d061950833 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -240,12 +240,25 @@ public class Main { diff --git a/patches/unapplied/server/0029-Add-version-history-to-version-command.patch b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch index 9c0a186f60..f83e8f5df2 100644 --- a/patches/unapplied/server/0029-Add-version-history-to-version-command.patch +++ b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch @@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index ff279901038dfbed6a0b51cc5355ccd17efc6883..2c2d492fdfafb1d2e4e962e6818bd9d7466347d5 100644 +index fea6b32015f9e2654c40ad90301d7aaeb0dabf72..6f543665b5ed42eaec6a410fa11f5a38da707110 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -189,6 +189,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/unapplied/server/0030-Player-affects-spawning-API.patch b/patches/unapplied/server/0030-Player-affects-spawning-API.patch index 1301c7a2ab..642d623010 100644 --- a/patches/unapplied/server/0030-Player-affects-spawning-API.patch +++ b/patches/unapplied/server/0030-Player-affects-spawning-API.patch @@ -21,7 +21,7 @@ index 984a13267cc1bb960507bc9231359bb4bb837205..668a7c3f36cdbe48e472cb810b27ae4a public static Predicate withinDistance(double x, double y, double z, double max) { double d4 = max * max; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 9e17033b801676f9db7739bd2ed710744f42defd..3500fd0045ad670de818dc170d9c68da643592e0 100644 +index 2acc00d8afe07b4d16abb831e4ddc8f454beec4e..1bdfc9c66538d9fd689bdccc1f4bc2dee4b5e7c5 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -840,7 +840,7 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0037-Always-tick-falling-blocks.patch b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch index ff78994090..2e80c8ca6a 100644 --- a/patches/unapplied/server/0037-Always-tick-falling-blocks.patch +++ b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Always tick falling blocks diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index b47b740186c200c420dcb4d1537a93c743a887c1..a526816f261de2a75a04be82596a7d8d674ead4a 100644 +index 6606a118e7bff01aa51440aea7540ec9feec6cc5..1d9ce6dae17ff572d4528971c69c63d0f85b313c 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -89,6 +89,7 @@ public class ActivationRange diff --git a/patches/unapplied/server/0038-Configurable-end-credits.patch b/patches/unapplied/server/0038-Configurable-end-credits.patch index 292210bb6d..0b37e68c63 100644 --- a/patches/unapplied/server/0038-Configurable-end-credits.patch +++ b/patches/unapplied/server/0038-Configurable-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 32ef9f1ae0c35e927133572ebb6fbf50b0729a63..e42c07dfba3c18464f1f8e35fbd764812d8c4e50 100644 +index 5a18f4649b64d47f429eb6c1dbb6238aab3eacd2..1136a3fe673680fcaca9b9768543ffada040153f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1066,6 +1066,7 @@ public class ServerPlayer extends Player { diff --git a/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch index 128b5274ef..30b29b9251 100644 --- a/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch +++ b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable mob spawner tick rate diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index 213fed3a2b32226fc128d213ee3e9fa3ae76e88e..64bd7d265a45575ce46c1a792f90cadc76763871 100644 +index 124703a7c043b6c3b651fa1a81c5ba3e99e47938..7ae0465091db8e8061737bf93884afa3db49feeb 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -45,6 +45,7 @@ public abstract class BaseSpawner { diff --git a/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch index 5d4f79d3b0..a9aa369b49 100644 --- a/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch +++ b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ee422a97a63749172f9f9643513ae9ab111c2400..321d14f241df1246061ba73b2488f5ab5326a734 100644 +index f157646156a659d0b87b1f72fd0d1d06d66bc543..9e182c4cdf54c9ca7701660df72052d5c8936a55 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -241,6 +241,7 @@ public class ServerPlayer extends Player { diff --git a/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch index d4862e9492..99d9a71065 100644 --- a/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch +++ b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch @@ -12,7 +12,7 @@ improve setPosition to use raw public net.minecraft.world.entity.Entity setRot(FF)V diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0363ad83af48ddcec37b5bd2fee49c3b1350576c..d9c45fb7a97797de2af2811f816110cc6c3681f6 100644 +index b40ddd8fb3e2d2bafaa2ece46714815d0d6d5f75..9e835d63e1592fc064b73c51eecd8b84cbedfa33 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -240,7 +240,7 @@ public abstract class PlayerList { diff --git a/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch index cc6788468d..84daa3ddda 100644 --- a/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 0c2dcaf8aac3c95f469ffef84bfd52fbc687129f..27830b5909660038a51ef7fc4ca78d9df64f562a 100644 +index 72ba8335d615fae73f7756003d0379117d2c73e7..b3fcbc3f5f0f8e9ca53fce85a4b86d4c292765df 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -102,7 +102,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch index 6fadafb931..eb0a532c36 100644 --- a/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch +++ b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch @@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4 // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d9031a89cc087fef8c39bcb93c68d07b8b2ab474..b6f8885196f806174f7d611c778fc1f74129d6d4 100644 +index a3f85b1cf8b03da90f2461cbe42dd18a630f2255..7ecf67635dd004b030ee5dde10cd7a9a7f4676cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ diff --git a/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch index 9df3cbc263..2cfba56f46 100644 --- a/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch +++ b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable portal search radius diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0d888e4c819d627119d1a97be8318027b95d46cb..03d5ea7094223be15c96c223ca81bdb8685cc1e7 100644 +index 30360e9e8787b893a360ba899d8fac657634de75..b1867fee71b925d6f5d76b0194d68dc2c6277ba0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3164,7 +3164,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -24,7 +24,7 @@ index 0d888e4c819d627119d1a97be8318027b95d46cb..03d5ea7094223be15c96c223ca81bdb8 return null; } diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java -index 3668f9775f377434779a8e519b10a11cf7b14dd5..389b63605d416678d35666bbd46e0fa05a02f898 100644 +index 0762bb248b3bd43a06e89aa1893a6189f0e13866..ed5210c63d964be7c28f59df315766794ec3ea1f 100644 --- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java +++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java @@ -43,7 +43,7 @@ public class PortalForcer { diff --git a/patches/unapplied/server/0058-Add-velocity-warnings.patch b/patches/unapplied/server/0058-Add-velocity-warnings.patch index 6a695ac86e..d1a2dda89f 100644 --- a/patches/unapplied/server/0058-Add-velocity-warnings.patch +++ b/patches/unapplied/server/0058-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 a4d530e81a319ea53122760e352083b9708f9f04..81758ba9193fad39a291c635c41d2cdbef34c1c2 100644 +index 10ef586cbbeae40dbdf01232c416ba132229daa2..c7849bda8cfaa9c6b581f180342687f30da0a639 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -299,6 +299,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch index 1e45747e48..fd96c4c0cf 100644 --- a/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch +++ b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b6f8885196f806174f7d611c778fc1f74129d6d4..3ec282a272257996fad17c3ac23b334aca344bb0 100644 +index 7ecf67635dd004b030ee5dde10cd7a9a7f4676cf..5c91414ca72609a89599baa9fba9774c5923ad10 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1160,7 +1160,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch index 4ec3ab1d5d..a54bc85f76 100644 --- a/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch +++ b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch @@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team" logic which is most likely to be true. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 03d5ea7094223be15c96c223ca81bdb8685cc1e7..3bd230370a956a557e0646cc5f92a9a171664876 100644 +index b1867fee71b925d6f5d76b0194d68dc2c6277ba0..2d37f4da83282e3430353e01c756a0d952150360 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2795,6 +2795,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/unapplied/server/0065-Complete-resource-pack-API.patch b/patches/unapplied/server/0065-Complete-resource-pack-API.patch index 9c8ede1409..699d952d0c 100644 --- a/patches/unapplied/server/0065-Complete-resource-pack-API.patch +++ b/patches/unapplied/server/0065-Complete-resource-pack-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c69a2da951af082b8dc90baf35b7e020ffda0b5e..cad7df80d4914b533ce9db1a10b5923b5ffe578b 100644 +index a4f0cb93a08136888a81f1a8e7ed1d56f92e2195..1c84143d271e70f6ffea301f3e93cd8ed8fd9bd1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1760,8 +1760,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -23,7 +23,7 @@ index c69a2da951af082b8dc90baf35b7e020ffda0b5e..cad7df80d4914b533ce9db1a10b5923b @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4045038fbe2dac5c5e18e3cdd68ce16ac3691b97..df91d5f9161e9bf65556191a3079ae0f008ab698 100644 +index 5c91414ca72609a89599baa9fba9774c5923ad10..038c34e62903afd19fb25b2125d5ed243e081139 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -189,6 +189,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch index b91f931e34..3c0a2ebd7c 100644 --- a/patches/unapplied/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/unapplied/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -44,7 +44,7 @@ index 53e666df97e74bbb8e96207ebc50e3e9acc455de..8435d0c62c716d4cce5d8b512d8a4265 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index df91d5f9161e9bf65556191a3079ae0f008ab698..a6d9dcf8487c63a0469f5fec27bef131b444942a 100644 +index 038c34e62903afd19fb25b2125d5ed243e081139..4e85199be8a1a7472d13856a697ec500b9566341 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2149,6 +2149,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0102-Add-server-name-parameter.patch b/patches/unapplied/server/0102-Add-server-name-parameter.patch index 1a54487255..e6e06601d7 100644 --- a/patches/unapplied/server/0102-Add-server-name-parameter.patch +++ b/patches/unapplied/server/0102-Add-server-name-parameter.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 268192b06592eaa56a454e0f02b2d848f766d9ac..4646911b65129d49b2398c7d86f2d6aa9213fe97 100644 +index e45fabbf0a7fe125c1b4f82894a177d061950833..6f2135690892f23e80648d4f9237cea34ec19740 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -166,6 +166,14 @@ public class Main { diff --git a/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch index 7c36138c34..9a9b84d7cf 100644 --- a/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch +++ b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 39f2db938edad3db6fa83d9f8431a28176d4011a..ed558935e53c3cc5c58e14786cbbd809401ddb81 100644 +index 6b87ed8b453b149bdd74eb3b164aa3bbcc8c2b13..518bf023127f40190aa29e9a132f19e98051e381 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1600,13 +1600,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch index e0cf8d0941..3ad41bbb27 100644 --- a/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch +++ b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ed558935e53c3cc5c58e14786cbbd809401ddb81..683c7fea13705ef78a4fd86f148428bb33956421 100644 +index 518bf023127f40190aa29e9a132f19e98051e381..54433d42a13b8967e38eeeb3052b8ff94c62c730 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -357,7 +357,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0121-String-based-Action-Bar-API.patch b/patches/unapplied/server/0121-String-based-Action-Bar-API.patch index a20532c90e..94cfa72b6f 100644 --- a/patches/unapplied/server/0121-String-based-Action-Bar-API.patch +++ b/patches/unapplied/server/0121-String-based-Action-Bar-API.patch @@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a6d9dcf8487c63a0469f5fec27bef131b444942a..4cc5ddcf8cf141f023ac45812c0ce26aa2937716 100644 +index 4e85199be8a1a7472d13856a697ec500b9566341..be3c08a3e1fed0588886e11bd0b7fd3e8499c877 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -340,6 +340,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0136-Item-canEntityPickup.patch b/patches/unapplied/server/0136-Item-canEntityPickup.patch index 560d54993d..5e23922424 100644 --- a/patches/unapplied/server/0136-Item-canEntityPickup.patch +++ b/patches/unapplied/server/0136-Item-canEntityPickup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 3500fd0045ad670de818dc170d9c68da643592e0..1f050f1c133e116e861e4e5f7e59875387543659 100644 +index 1bdfc9c66538d9fd689bdccc1f4bc2dee4b5e7c5..58d6a0bc8e94eaa22dcd5d86522ab378e5b3e7cd 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -668,6 +668,11 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0150-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0150-Fix-this-stupid-bullshit.patch index 9280b6f54a..6a38ba7bd3 100644 --- a/patches/unapplied/server/0150-Fix-this-stupid-bullshit.patch +++ b/patches/unapplied/server/0150-Fix-this-stupid-bullshit.patch @@ -31,7 +31,7 @@ index 8ff786c366332588a2df053438f23cc9fb7e2b84..c887d34171f89c731d76c4ca92c70be2 Bootstrap.isBootstrapped = true; Instant instant = Instant.now(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c5a403bc04fcb7a0fbc1dd1fe9ebf374e6a62af3..c79afabed432ca9094967ae0e48b04133dc4c51b 100644 +index 960885c891c98859e8ef375d0796c8b53fcf562c..863a983165aa845abbf7b8f2a3cd0c5057bb47d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -257,10 +257,12 @@ public class Main { diff --git a/patches/unapplied/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch index c3ba0ffb39..a2f6687d94 100644 --- a/patches/unapplied/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/unapplied/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index df0c787a6e3cff522dc540aab3986692b4fc4cc3..6e7f341c6ad07152eeeb51b4cb9c237a94fac89b 100644 +index 705289d37139e8ec213f972292d4a8efc294f4cf..e1dc32d94576d751c4078d78fbf3ce3b47f02159 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { diff --git a/patches/unapplied/server/0157-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0157-Add-PlayerJumpEvent.patch index 2c03360f02..ef5b94b789 100644 --- a/patches/unapplied/server/0157-Add-PlayerJumpEvent.patch +++ b/patches/unapplied/server/0157-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 79ec73cbd1c44ec0ec5c6fff3c70501051a9ba42..cf1d8913d74e2e1c1b8d6be53cdea4873cd2ee10 100644 +index 0c869475bc81b635e98fa5d396db434ecf2d54e4..18c9c39fd5574326d9137724773b7403c3c3429d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1294,7 +1294,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0159-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0159-Expose-client-protocol-version-and-virtual-host.patch index 399395b776..84f1f25b23 100644 --- a/patches/unapplied/server/0159-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/unapplied/server/0159-Expose-client-protocol-version-and-virtual-host.patch @@ -90,7 +90,7 @@ index 77d7f070cce1a47e41b5d4f5a1cc8c778352a126..a3b610cb1ed97a635677bc46ccdf0463 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4cc5ddcf8cf141f023ac45812c0ce26aa2937716..07049ca56e610755bfc41c6094be87f5f88bd671 100644 +index be3c08a3e1fed0588886e11bd0b7fd3e8499c877..4d83b02dd2f00b613bfb1c7be7c93f0bc00bbf58 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -286,6 +286,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0160-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0160-revert-serverside-behavior-of-keepalives.patch index f861148081..f9c36a4bcd 100644 --- a/patches/unapplied/server/0160-revert-serverside-behavior-of-keepalives.patch +++ b/patches/unapplied/server/0160-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 8a331d8a440455b0d49ba0b8bb65184fba13c43a..bc5c661394d5c64f9d50a615583ff7eb646534db 100644 +index 63003915799f636af2d60778f059a5667e199baf..51edb4f6be04b9c3b0745bc13fe7ce7cc4868e59 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -261,7 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0169-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0169-Ability-to-apply-mending-to-XP-API.patch index aa023fd0ef..0be22f3bae 100644 --- a/patches/unapplied/server/0169-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/unapplied/server/0169-Ability-to-apply-mending-to-XP-API.patch @@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 07049ca56e610755bfc41c6094be87f5f88bd671..d65866df71add5da89de3bfb3bd3d12ac59a0c87 100644 +index 4d83b02dd2f00b613bfb1c7be7c93f0bc00bbf58..b71b83b2984e51202e9a40945946ebdd6b999cc2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1538,7 +1538,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0182-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0182-Player.setPlayerProfile-API.patch index b5e949057a..1ed3062359 100644 --- a/patches/unapplied/server/0182-Player.setPlayerProfile-API.patch +++ b/patches/unapplied/server/0182-Player.setPlayerProfile-API.patch @@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in. public-f net.minecraft.world.entity.player.Player gameProfile diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 74adfbde6e4635390a29f8e9155fa61a30631055..a1b26e5a2b100bbfa4dcca6573720f3b891759dd 100644 +index a6e6c82be3a6f397c6cefbd843b17c86bb0ff2f7..d01daadf038b381c4b0d7787553ccd341c0787af 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1540,7 +1540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -55,7 +55,7 @@ index b17fe83bcd7bde44ee8c1f872fffa8bf40707c50..aac78c13361b19efa7b43a0c95458390 public Server getServer() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d65866df71add5da89de3bfb3bd3d12ac59a0c87..d24d1b02851c81755ee56e14d0defecb6b2632e5 100644 +index b71b83b2984e51202e9a40945946ebdd6b999cc2..c48205d83eff82decf73724a315d2a9265d197e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -269,11 +269,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch index 6cf06e726e..00546ba9aa 100644 --- a/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch +++ b/patches/unapplied/server/0187-Flag-to-disable-the-channel-limit.patch @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d24d1b02851c81755ee56e14d0defecb6b2632e5..91eb7f4fb65fcaa4c953f9567971df243387816a 100644 +index c48205d83eff82decf73724a315d2a9265d197e4..0868e977d356a1e3b5c49c9c788d8e3d0cb85c84 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -192,6 +192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch index b679b5fe16..8413b22dd6 100644 --- a/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch +++ b/patches/unapplied/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch @@ -83,7 +83,7 @@ index 9e4b430c8d3ed6538e8b2549ee3f61b9e0d98c42..fe14ebe86ce2bc5835e51c7bbe56a5d6 } diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 1f050f1c133e116e861e4e5f7e59875387543659..e1f2bb40ca7868671a869745de66f87ef3a49408 100644 +index 58d6a0bc8e94eaa22dcd5d86522ab378e5b3e7cd..2fc099e2fb17073f3ab4ac5e868b1c583bf8a594 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1633,7 +1633,7 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 4f68f2dd3e..69df9da1fd 100644 --- a/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/unapplied/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index 6e7f341c6ad07152eeeb51b4cb9c237a94fac89b..e6d66db4b5fe4385c34329897c8277e4bc814129 100644 +index e1dc32d94576d751c4078d78fbf3ce3b47f02159..ae64cbbff21ab56d27fd55a4f21b6241d0a54e98 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { diff --git a/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch index d4f532099c..afa3e0be97 100644 --- a/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/unapplied/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4649d9bd175f88f1caade1618d08ae64a8aaa649..196d19fe999372f4cda56e2ad55ec263be685f79 100644 +index 32acb0ea31c3d617a0a087e11e5a8bfa6eb83db9..9092a04f7a98f022c9a9bfe5310643b4b89ce2e7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -267,6 +267,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0252-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0252-Expose-attack-cooldown-methods-for-Player.patch index 10f54f82b6..5f46dcad2d 100644 --- a/patches/unapplied/server/0252-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/unapplied/server/0252-Expose-attack-cooldown-methods-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ef566466afb9665824e3f5c5c16a411cdf1abadc..b440d2ff504ca84516da21ca604b8c72f2582a33 100644 +index 240f90460ddddf8168b7bc661a55fe7e5c94c67d..b5e85e664dda27c1fb342e47d901909742aec67d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2827,6 +2827,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0253-Improve-death-events.patch b/patches/unapplied/server/0253-Improve-death-events.patch index 4eb97720e1..c541ef2d08 100644 --- a/patches/unapplied/server/0253-Improve-death-events.patch +++ b/patches/unapplied/server/0253-Improve-death-events.patch @@ -225,7 +225,7 @@ index c995c8ac6785e5f8951013f3a37127573351c2c7..d84375984c67a8ad2790efc1c584f7e2 // CraftBukkit start public int getExpReward() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index e1f2bb40ca7868671a869745de66f87ef3a49408..d7f24c26b0981184f43a16a27a0c5d5a931d4de3 100644 +index 2fc099e2fb17073f3ab4ac5e868b1c583bf8a594..3081c1370a0854f07214cbc50b06cbb005d171fb 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1068,7 +1068,13 @@ public abstract class Mob extends LivingEntity implements Targeting { @@ -392,7 +392,7 @@ index 719f68f96e58ddcdd3592131c691d21263c81915..a35a0952ce8e1fc42e92734786d531c7 this.gameEvent(GameEvent.ENTITY_DIE); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b440d2ff504ca84516da21ca604b8c72f2582a33..cd1937e8b66f6229ab1dc39576641a67aa127bc9 100644 +index b5e85e664dda27c1fb342e47d901909742aec67d..1c09e955e34380b99572cc5950806417ac10bfc8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2327,7 +2327,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch index 01899e41b8..39dfd45c36 100644 --- a/patches/unapplied/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/unapplied/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 196d19fe999372f4cda56e2ad55ec263be685f79..e94389567ccca1565d1430220022548d52283e38 100644 +index 9092a04f7a98f022c9a9bfe5310643b4b89ce2e7..585376aecc7329975a5d3e6b7c091f5b14daebd2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -569,9 +569,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch index 0210a1f908..f0d5778edf 100644 --- a/patches/unapplied/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/unapplied/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch @@ -59,7 +59,7 @@ index 7adf7d1248680e591638298f13f5ae88788f5e4c..bdf11a98614c9c12d3112f437651be81 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 e94389567ccca1565d1430220022548d52283e38..a81d98c6220de281a7e6b495c6f0122770a32990 100644 +index 585376aecc7329975a5d3e6b7c091f5b14daebd2..9f87d35fb20b63b01252dc844ca3a584c16c7129 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1664,6 +1664,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0287-Book-Size-Limits.patch b/patches/unapplied/server/0287-Book-Size-Limits.patch index a796772a1f..266ebb26c0 100644 --- a/patches/unapplied/server/0287-Book-Size-Limits.patch +++ b/patches/unapplied/server/0287-Book-Size-Limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a81d98c6220de281a7e6b495c6f0122770a32990..1c2985463fbfe9c4c8357519019bab4fa82d5194 100644 +index 9f87d35fb20b63b01252dc844ca3a584c16c7129..c5b682d08ab270d153eb600afe9a21bfa1305072 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1126,6 +1126,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index d97961b72f..5898d2d6bb 100644 --- a/patches/unapplied/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/unapplied/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -106,7 +106,7 @@ index aac78c13361b19efa7b43a0c95458390f1ba8340..f572a74b85df36a6da76b78ec29d8072 public Location getLastDeathLocation() { if (this.getData().contains("LastDeathLocation", 10)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cd1937e8b66f6229ab1dc39576641a67aa127bc9..24f9f3e5de710dd294d9d9ab054f9c84d1798be7 100644 +index 1c09e955e34380b99572cc5950806417ac10bfc8..a9f80c019f5a127d9273833608917c59748ae867 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -193,6 +193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0292-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0292-Block-Entity-remove-from-being-called-on-Players.patch index 13edbabacd..8c882dd005 100644 --- a/patches/unapplied/server/0292-Block-Entity-remove-from-being-called-on-Players.patch +++ b/patches/unapplied/server/0292-Block-Entity-remove-from-being-called-on-Players.patch @@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to be unintentional in the few cases we've seen so far. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 24f9f3e5de710dd294d9d9ab054f9c84d1798be7..53444591285041a3ca93d5c96a7278bcab952742 100644 +index a9f80c019f5a127d9273833608917c59748ae867..08404472a89192fb0cbae0192793c4c4ae63a9bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2874,6 +2874,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0295-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0295-Implement-Brigadier-Mojang-API.patch index b704b089cf..1488e30829 100644 --- a/patches/unapplied/server/0295-Implement-Brigadier-Mojang-API.patch +++ b/patches/unapplied/server/0295-Implement-Brigadier-Mojang-API.patch @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index e6d66db4b5fe4385c34329897c8277e4bc814129..6807a91d4d55dc90e2820caa855a44844c87b7e2 100644 +index ae64cbbff21ab56d27fd55a4f21b6241d0a54e98..eecadeb81317834741b083fe8c5da77519d196a3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,7 @@ val alsoShade: Configuration by configurations.creating @@ -131,7 +131,7 @@ index b7f1569c662df13f278fc704cabec0400ba7c382..87ce129e1d592bcf68169feb559f44d5 if (commandnode2.canUse(source)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1c2985463fbfe9c4c8357519019bab4fa82d5194..f286a4f65aba9706a1c7a6100b4045e6b47dc059 100644 +index c5b682d08ab270d153eb600afe9a21bfa1305072..6b49981d61e910d8d8fa09ff091359754e6d09a3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -842,8 +842,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch index 3f28cb9b92..546cc90740 100644 --- a/patches/unapplied/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/patches/unapplied/server/0310-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 40955343416bc8db479d13cb7b86246b6ea4f276..92a0ab42abdb0d6bd77bb2141a900a0f3d4630c5 100644 +index 593f017a43153c081f007073926fa4f520bded00..732238a60dacd83b6572f6f79763f112e5fe9611 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -517,7 +517,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0337-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0337-Entity-Activation-Range-2.0.patch index 3307f83ebb..e7d5dfcecf 100644 --- a/patches/unapplied/server/0337-Entity-Activation-Range-2.0.patch +++ b/patches/unapplied/server/0337-Entity-Activation-Range-2.0.patch @@ -148,7 +148,7 @@ index 0f40361ebfe64fae828f577529200e40e94b0e05..049df55b07e14b6ea75bfb9aa4de2adb movement = this.maybeBackOffFromEdge(movement, movementType); Vec3 vec3d1 = this.collide(movement); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index d7f24c26b0981184f43a16a27a0c5d5a931d4de3..76b2772fb79ebb4e0712d1e501c37fd14ea2fa62 100644 +index 3081c1370a0854f07214cbc50b06cbb005d171fb..cbdbc859416d51d0311ce5f6032a2b4dfe34d3a7 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -218,6 +218,19 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0371-Improved-Watchdog-Support.patch b/patches/unapplied/server/0371-Improved-Watchdog-Support.patch index 262b7dc945..77647afa20 100644 --- a/patches/unapplied/server/0371-Improved-Watchdog-Support.patch +++ b/patches/unapplied/server/0371-Improved-Watchdog-Support.patch @@ -283,7 +283,7 @@ index 5b8b345ade30012371bdda744ba82c585f74db07..0d100788312a234616c1401656f09835 // Paper start - Remove from collideRule team if needed diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java -index ffb691898d1c9c108be520dc8968214eacb425d5..a1f190cb17344f72e72c4205a011c08824c62cea 100644 +index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb8941238bfa 100644 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java @@ -152,6 +152,7 @@ public abstract class BlockableEventLoop implements Profiler @@ -319,7 +319,7 @@ index c3760f22fcc56ccb25e3315823054416c2172386..246606164117e8140ab0892ec1326503 final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 09c13423e055ad414651a5cab43d10be4041e6f3..d91a839819e260e90f810968077c491060eafa22 100644 +index 2badebc0d7954c6d343bfd66dd14dc2d2d4661d7..f847527bf22fa34817dee79e61a47545b1e1f7bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -178,6 +178,36 @@ public class Main { diff --git a/patches/unapplied/server/0377-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0377-Implement-Player-Client-Options-API.patch index 62d5e4dfa3..ed8390ee7f 100644 --- a/patches/unapplied/server/0377-Implement-Player-Client-Options-API.patch +++ b/patches/unapplied/server/0377-Implement-Player-Client-Options-API.patch @@ -116,7 +116,7 @@ index 0e7f5d780d8c17a68a6d3cf98febad94f63e3f81..f4a8491d6b6333030cecee3920da060d if (getMainArm() != packet.mainHand()) { PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 53444591285041a3ca93d5c96a7278bcab952742..2e09a49d52cbd23d3181d41a0540d11a3bd80fca 100644 +index 08404472a89192fb0cbae0192793c4c4ae63a9bb..cb9482240de0d5d56be4ec591b4fbb23006767c1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -602,6 +602,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch index 0552ea6414..11588f9183 100644 --- a/patches/unapplied/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/unapplied/server/0386-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 92a0ab42abdb0d6bd77bb2141a900a0f3d4630c5..54fbf24915aa614747282c71d3cd07e1dfbd2718 100644 +index 732238a60dacd83b6572f6f79763f112e5fe9611..17886c426f4d95a71e034b4fd24c2b6e5cf5bc45 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -969,7 +969,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 6a3117ce24..9df8e72601 100644 --- a/patches/unapplied/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/unapplied/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index be1fbe64a5145b25c111ba3b6bb35109e77deb9d..2dca21932c5c97a13c77a559400f0d01eba42c34 100644 +index f847527bf22fa34817dee79e61a47545b1e1f7bc..3250274384fabb11e241837007e543cb81dd3b6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -26,6 +26,7 @@ public class Main { diff --git a/patches/unapplied/server/0391-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0391-Prevent-teleporting-dead-entities.patch index 1ee8d4b487..394ca71b98 100644 --- a/patches/unapplied/server/0391-Prevent-teleporting-dead-entities.patch +++ b/patches/unapplied/server/0391-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 54fbf24915aa614747282c71d3cd07e1dfbd2718..1a4c0347e2977f33efe489b3bbb7047be3132162 100644 +index 17886c426f4d95a71e034b4fd24c2b6e5cf5bc45..b20da25677ea5e69d6994b8dbe5ad0ee8e096039 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1617,6 +1617,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 225ab59b99..1f59c0dfa4 100644 --- a/patches/unapplied/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/unapplied/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and diff --git a/build.gradle.kts b/build.gradle.kts -index 17c672625c92f57720323d4fcb64886eb1b23484..6ba3b89bd18210cec31b181d025fd4d07dce3cc2 100644 +index eecadeb81317834741b083fe8c5da77519d196a3..f037aff2f85f5ece47198f3957689a589045a95b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { diff --git a/patches/unapplied/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch index d10f83dcba..a83bfe972d 100644 --- a/patches/unapplied/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/unapplied/server/0413-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 1a4c0347e2977f33efe489b3bbb7047be3132162..2939403b788c3e656cb7b600242db6e3269d90eb 100644 +index b20da25677ea5e69d6994b8dbe5ad0ee8e096039..b9fdfa115262a1f16a2bbffa373c3438b38adbb3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1443,6 +1443,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0419-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0419-Add-permission-for-command-blocks.patch index abaf29b36a..d6fbce9ddf 100644 --- a/patches/unapplied/server/0419-Add-permission-for-command-blocks.patch +++ b/patches/unapplied/server/0419-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index 58a1a54b676922ef0862dcab98e7aada5de80311..cf47536a2e37d53406fc9cb3f09095e0 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 2203795cdb63398095f9c467cbaf605aa7c7b856..61053ccdcf5e588164f243faa9ef6beda5bf45fc 100644 +index cff8b643efadcc153b03af1335885376746b48be..4de14bd6390537730f764137390be4e7861d9894 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -880,7 +880,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch index b7700b9eaf..e9f45cb86e 100644 --- a/patches/unapplied/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch +++ b/patches/unapplied/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index b549de337b1556816e3c4932546693cc3b8ad5d3..6b6b59e4a791cd8518e2e25fba1c63d63e81b1d1 100644 +index 839055c2cb941c36c3d7e3eaf61a277b25d16acb..f1f38d96206e7e10615eac0c53bbbc7426b7e615 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -180,8 +180,17 @@ public class Main { diff --git a/patches/unapplied/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch index 288f85c2a1..8803ddb9f4 100644 --- a/patches/unapplied/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch +++ b/patches/unapplied/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 6b6b59e4a791cd8518e2e25fba1c63d63e81b1d1..028b6c09796cec412f4aab56e99ba1b8bdfcc8ff 100644 +index f1f38d96206e7e10615eac0c53bbbc7426b7e615..27eb466c3f5f4342f892d1c55c15108ae6861912 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -180,6 +180,7 @@ public class Main { diff --git a/patches/unapplied/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index ef545c89fb..89f77ac6b8 100644 --- a/patches/unapplied/server/0464-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/unapplied/server/0464-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 a10e4d99bd7e6588cd09d17ebcc3e68f05b9e87b..d7696d0bf090adb403e9461c93f0649585985d50 100644 +index 37e5b479a093184e7d8d05c13e69b2682b5dac92..6cdf9921c9936ef7508605ee6b4c73157ca2fd4b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -762,7 +762,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0474-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0474-Fix-for-large-move-vectors-crashing-server.patch index c9807796cc..2a344a1e07 100644 --- a/patches/unapplied/server/0474-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/unapplied/server/0474-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 d7696d0bf090adb403e9461c93f0649585985d50..87f3ac68e8e60ac8c890280d491c326a1575f810 100644 +index 6cdf9921c9936ef7508605ee6b4c73157ca2fd4b..06ccc5d528fe5411de306d787b705f7863777dc6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -569,9 +569,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0480-Player-elytra-boost-API.patch b/patches/unapplied/server/0480-Player-elytra-boost-API.patch index 4cce8bd169..c97e3a78f4 100644 --- a/patches/unapplied/server/0480-Player-elytra-boost-API.patch +++ b/patches/unapplied/server/0480-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d5f03bd485403fd2222bba0dbbf37e438b99ef28..5179e70d91bdbf2f466e15ade3466f30e8a3fe2d 100644 +index c96efc055e44dcc7880abb3a6e7b4c441aa9a112..63160efd1f5b555d024264edec479aa99e2b519b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -624,6 +624,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0490-Add-API-for-quit-reason.patch b/patches/unapplied/server/0490-Add-API-for-quit-reason.patch index 0cfdf221ae..c5933dd497 100644 --- a/patches/unapplied/server/0490-Add-API-for-quit-reason.patch +++ b/patches/unapplied/server/0490-Add-API-for-quit-reason.patch @@ -37,7 +37,7 @@ index e087b62f88157d57eb037feb0d39c076b286f755..0b81878a951643af1ce785b3adcca9b3 private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 87f3ac68e8e60ac8c890280d491c326a1575f810..a82b911450feb011cc8776a0dece478bb94d4221 100644 +index 06ccc5d528fe5411de306d787b705f7863777dc6..c115d103cbc28a511aedcdcd40ce6a50a777b102 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -509,6 +509,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index 0a051370d4..b4986fc3eb 100644 --- a/patches/unapplied/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/unapplied/server/0494-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5179e70d91bdbf2f466e15ade3466f30e8a3fe2d..4a363ffbf6ee527b1eaea00e41b3387cb31e70a2 100644 +index 63160efd1f5b555d024264edec479aa99e2b519b..309b489c11387a0a3555813a848b7be978ba2529 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2520,7 +2520,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0534-Add-sendOpLevel-API.patch b/patches/unapplied/server/0534-Add-sendOpLevel-API.patch index 4957f3439e..7afbb5a3c8 100644 --- a/patches/unapplied/server/0534-Add-sendOpLevel-API.patch +++ b/patches/unapplied/server/0534-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index 13e2fb9e48ed8722b68b2ce2994d9d84bb22cee4..600bb44d97b477960108ea8cd84a8e73 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4a363ffbf6ee527b1eaea00e41b3387cb31e70a2..f4ac6130d1112fb908cfd61698207b81d182b492 100644 +index 309b489c11387a0a3555813a848b7be978ba2529..04abb49aa5b947e4c265471358981ed41b36ddd6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -638,6 +638,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch index bc6c44b2e2..4771f472bb 100644 --- a/patches/unapplied/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/unapplied/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 76b2772fb79ebb4e0712d1e501c37fd14ea2fa62..1887b9cd309556eeacac2a5e5cd922560101fa72 100644 +index cbdbc859416d51d0311ce5f6032a2b4dfe34d3a7..5b134bd0cc4c2ba20eaf275c190c139d987d9bcb 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1298,12 +1298,15 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0567-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0567-Allow-using-signs-inside-spawn-protection.patch index c7d1ee178c..85554c8409 100644 --- a/patches/unapplied/server/0567-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/unapplied/server/0567-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d0fee1a4d728213a6b0c9bf9f26101d1a5bbec9f..a384a212431326d22ca3d08dfbebe4f22e829434 100644 +index 240b1f8efa672fb6d1967ef2b895c6710596e2cd..8a63c2e82360fc90bf9f75c5ec4c580f40d2436d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1831,7 +1831,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 9b9bd73b92..d1fd3da9c7 100644 --- a/patches/unapplied/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/unapplied/server/0573-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 a384a212431326d22ca3d08dfbebe4f22e829434..cff72f44445db49de5ec12b47499bb1b2050ee03 100644 +index 8a63c2e82360fc90bf9f75c5ec4c580f40d2436d..4f3ffde225a46439563c3b33f48a0197bf74bbf1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1292,7 +1292,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch index 6f14fbd851..740a0421c6 100644 --- a/patches/unapplied/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/unapplied/server/0583-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 cff72f44445db49de5ec12b47499bb1b2050ee03..ab295581a05686a9cd6c2397a7d4b8f32c098ba9 100644 +index 4f3ffde225a46439563c3b33f48a0197bf74bbf1..d22f9a39a7655ed41ad21f5794b7b2c77d582310 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2045,6 +2045,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0602-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0602-Add-environment-variable-to-disable-server-gui.patch index 66566983ec..56b953c03b 100644 --- a/patches/unapplied/server/0602-Add-environment-variable-to-disable-server-gui.patch +++ b/patches/unapplied/server/0602-Add-environment-variable-to-disable-server-gui.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add environment variable to disable server gui diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 028b6c09796cec412f4aab56e99ba1b8bdfcc8ff..4bd47eeb9e4c8ece2ba43a6c8c4e89b1e67ed9d9 100644 +index 27eb466c3f5f4342f892d1c55c15108ae6861912..f035065aa46a8c1a2c3064b82208fbdc5ac4463d 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -304,6 +304,7 @@ public class Main { diff --git a/patches/unapplied/server/0606-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0606-Move-range-check-for-block-placing-up.patch index a46d1ca835..9aa2d5113f 100644 --- a/patches/unapplied/server/0606-Move-range-check-for-block-placing-up.patch +++ b/patches/unapplied/server/0606-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 6fbed22273227d159797bd38ab4c1705180559f3..b245e87adb867e84f13b13863183f70ab889802b 100644 +index bb483fbc201c6041bafc75d822b46e5d06cd75dc..b7b9575b84f35757c24ad43bd187e2bd623d672c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1817,6 +1817,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch index d46f441bde..0e3a92a785 100644 --- a/patches/unapplied/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/unapplied/server/0632-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 47dafff9552ded18780f5a059768f9dbb7a69ba8..d69c4cccc1a26284bfb3a12a332df85ee14a4906 100644 +index 08a69f7a2d153aee1b9637085be04d3065b6df08..006035b94ab0490c0dd5747906398965016b3e42 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1211,7 +1211,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch index 65321f7218..af2e67c835 100644 --- a/patches/unapplied/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/unapplied/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch @@ -17,7 +17,7 @@ index e100534a676bd950513f3b9217e4949b65f20960..0a25e2bb95fa249fa5cde1a174702bb3 public boolean isRealPlayer; // Paper public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fff82d1fde56ff8ca564b3209877dedc0b384c20..3c6e4819065786c89773476edf89b5d88db8559d 100644 +index b673f6a43e4b057b1a5c78398a6e40bf73340112..9d519076d8ae50ab04c1a3c83c92b6d127a11321 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -516,7 +516,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0638-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0638-Add-config-for-mobs-immune-to-default-effects.patch index 52d1d0094d..5c2ded6104 100644 --- a/patches/unapplied/server/0638-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/unapplied/server/0638-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ad613b0d6c430a52ee706064c8638a643c2c5ffa..2cb08ccd53a1548c1e65065a4eeb5e4f577e34a6 100644 +index 4246122a794018b526e1619dcd066c2c88f4786c..463ae3d9e75b32da0aa91ebbbf1a34ee74825224 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1163,7 +1163,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0645-Add-System.out-err-catcher.patch b/patches/unapplied/server/0645-Add-System.out-err-catcher.patch index d386ddaed0..9bcf49002f 100644 --- a/patches/unapplied/server/0645-Add-System.out-err-catcher.patch +++ b/patches/unapplied/server/0645-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ff3fcaa91b7cd50eaff3bdb1ae15d222b197ba97..fc8d0b81054cad7dbfebd29b2d92a52952357fc2 100644 +index 492642f3fad94a0770c94d2090f51a3bdd57638c..1ed8ced7f72af6a135718e4a06dd46ce352361a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -303,6 +303,7 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0647-Improve-boat-collision-performance.patch b/patches/unapplied/server/0647-Improve-boat-collision-performance.patch index d01186c267..f406382eb3 100644 --- a/patches/unapplied/server/0647-Improve-boat-collision-performance.patch +++ b/patches/unapplied/server/0647-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 7354711e194ab58b11b68f447c1fc795fe611a65..5579dad0ba8f2e4ce43883e7d36059c2 }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2cb08ccd53a1548c1e65065a4eeb5e4f577e34a6..8cde3d6c34226c197645a382e65d3c9ab685fff7 100644 +index 463ae3d9e75b32da0aa91ebbbf1a34ee74825224..693fe96b508a78545c180dda8ab40d6456896db4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1382,7 +1382,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch index 812b682bf9..0ba490ad65 100644 --- a/patches/unapplied/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/unapplied/server/0648-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 3c6e4819065786c89773476edf89b5d88db8559d..75ea5d01a515dcc604a1414d7261887ca71b243e 100644 +index 9d519076d8ae50ab04c1a3c83c92b6d127a11321..96a414a09e125ca0ea3ccf2589abf47a39fad92d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -433,7 +433,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0650-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0650-Add-PlayerSetSpawnEvent.patch index 3b0c94b6e2..40b2fc5bd7 100644 --- a/patches/unapplied/server/0650-Add-PlayerSetSpawnEvent.patch +++ b/patches/unapplied/server/0650-Add-PlayerSetSpawnEvent.patch @@ -187,7 +187,7 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 04979441a1e654d978b858acb2219da6615ed8a6..0e753ae3a5db5406d779371bcb5c791bdf93c261 100644 +index 54027efe50942ad1ac3fbe45e9a02b7e7eac0f28..cda8b48a77fc23a674b9e3ef1b60649bcac294f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1321,9 +1321,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0657-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0657-Make-EntityUnleashEvent-cancellable.patch index 3d733321df..f67103ff73 100644 --- a/patches/unapplied/server/0657-Make-EntityUnleashEvent-cancellable.patch +++ b/patches/unapplied/server/0657-Make-EntityUnleashEvent-cancellable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make EntityUnleashEvent cancellable diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 1887b9cd309556eeacac2a5e5cd922560101fa72..b6e48531a2a1316eef786e0476574eb1c3c29a9e 100644 +index 5b134bd0cc4c2ba20eaf275c190c139d987d9bcb..90d95dc95fe8868a4c0298acb0e1c6ce7bd883cb 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1543,7 +1543,7 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch index 701231d24f..760883c7b9 100644 --- a/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch +++ b/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch @@ -72,7 +72,7 @@ index 4164204ba80f68a768de0ed1721c6447b972a631..4ae1ba645d9fdc1eb6d5a3e4f8ceed9b List list; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 4e65e1d2d1538366f554d94bff31ab74c2e8a225..ee298a136d95a2759ee77ffc11cf6e43cc54c1bb 100644 +index 80b2ff12e48e1aabebd9ebcf5958c1f5d073d55b..bcf0dfe50add8e260a280e45673727f964bac6fd 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -115,6 +115,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator; diff --git a/patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch index f91efb0264..a5401d113d 100644 --- a/patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/unapplied/server/0689-Detail-more-information-in-watchdog-dumps.patch @@ -203,7 +203,7 @@ index 0d2506350e2c57044bf7c751627b6e0d76077e82..0e494502bc6d52f277d240d839e02b51 int j = Mth.floor(y); int k = Mth.floor(z); diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index e0a71bfc1498a517456b21747ab6ef3f1067a3f3..98fba0288be9ed2cb18ffba5cf81148157dd4fcf 100644 +index 7071327fab87d53e794374c701d7c2748c439aaa..50c72e5db369a180f425eaaa0411cb8871bc3463 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -22,6 +22,78 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa diff --git a/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch index 2d9af16a21..a62fd88bd6 100644 --- a/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch +++ b/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch @@ -208,7 +208,7 @@ index fb9cf86250939fbc9cf1bfb90f6a1a7f4a489460..84ef33f700d3205d934802dceb4a2279 this.handlingTick = true; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index b6e48531a2a1316eef786e0476574eb1c3c29a9e..e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5 100644 +index 90d95dc95fe8868a4c0298acb0e1c6ce7bd883cb..3d5c967dbccb2a288092a3bf950ab4bfda7a3bb4 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -858,7 +858,12 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/unapplied/server/0707-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0707-Use-Velocity-compression-and-cipher-natives.patch index 21039c9adb..ae158dd968 100644 --- a/patches/unapplied/server/0707-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/unapplied/server/0707-Use-Velocity-compression-and-cipher-natives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives diff --git a/build.gradle.kts b/build.gradle.kts -index a24d682d77682c8421ed1e37be3905b2a5c8aff9..a62f151047f90ef1db278192b29b3bd3213d4d46 100644 +index d1f2469815cc0dd742777b18421db7d83deac83f..5945324724822da7cb95d4b63da07f1ace34f999 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,6 +41,11 @@ dependencies { diff --git a/patches/unapplied/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 74f1720079..19ef21f706 100644 --- a/patches/unapplied/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/unapplied/server/0712-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 c534dadb3414c487fd3afbf7be71bfcbf55d66ab..bcf93ca2dacbd527db8b17f4e1a7d1836ae493f7 100644 +index ee5cb4efcf5e63321e34cea77afa6af7b402b651..31c8b483006febd23363f7bcc2c09bde37b84847 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -849,6 +849,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch index b06d7994ff..1a27b58ec3 100644 --- a/patches/unapplied/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/unapplied/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 199f802b3bed9ec25027d33e47329a80770755f2..a26a2cb41206f66c209c6b9c2328f46487ac9aba 100644 +index 4e368756efce3cb31bd88a2145a97b00366fa977..b9c3e19feb29a4a67fe78cd5d5b0cca7b570d2de 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2648,13 +2648,26 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch index be8f93250a..0c8213ee0d 100644 --- a/patches/unapplied/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/unapplied/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,7 +34,7 @@ index e7c0d214abbad1f300049f790ae54e7ea488e150..24f0d61a2fa9ac95dd26443a978209b5 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a26a2cb41206f66c209c6b9c2328f46487ac9aba..d481eeac08535bc79b5714afa376a2fe2843516c 100644 +index b9c3e19feb29a4a67fe78cd5d5b0cca7b570d2de..de69507b71c79172f0581aa58a7ac7e9a002444f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3157,7 +3157,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch index 4acd15fccd..82207e2a5c 100644 --- a/patches/unapplied/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/unapplied/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN CHECK ME diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 33a7ff327b7ba69fde0ce39bcf347892479ae479..c89c6c9f315756dc46f253a155d34bb229eca21c 100644 +index 81750c1551a69d1c77ab8c34437e5d839b7e2941..6345d9d3ade4c490e4a6266fc5ecbd5b2de8ddeb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -649,7 +649,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0767-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0767-Multi-Block-Change-API-Implementation.patch index a1607cdb8c..7b40e1c881 100644 --- a/patches/unapplied/server/0767-Multi-Block-Change-API-Implementation.patch +++ b/patches/unapplied/server/0767-Multi-Block-Change-API-Implementation.patch @@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0e753ae3a5db5406d779371bcb5c791bdf93c261..488b92974ac42b08478c0afd9b6115afe4996dc7 100644 +index cda8b48a77fc23a674b9e3ef1b60649bcac294f8..166c7d1c23862b65b332ca6573a2a75c5926c9e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -889,6 +889,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0769-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0769-Freeze-Tick-Lock-API.patch index f84b9cd585..b9b01c6451 100644 --- a/patches/unapplied/server/0769-Freeze-Tick-Lock-API.patch +++ b/patches/unapplied/server/0769-Freeze-Tick-Lock-API.patch @@ -46,7 +46,7 @@ index d441db38210b15c6fae5a1632f4e2372c7a04b7c..ceddbc2e0fdec358bd7776af264df336 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b5996e86d2bfcb6d52b10c79bffb92d76954b714..d559d34524e84e7cb5a59756214eac6c9658bd87 100644 +index a35e59544786776391ba135f247ac1a28be3d754..50ee81007ae10f68aa40a666605203862f5e20a8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3417,7 +3417,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch index c62ee957eb..744e2879a2 100644 --- a/patches/unapplied/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/unapplied/server/0793-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 661a5ee162829a060284a870e1704f615cc768ac..21c7cf0af2cc65f1f0275f4089326cdcfd94ec90 100644 +index 9535d8effbc588b69df9dba9aba4b3090370ae69..8b33da482a7971d6481283c37485185925bd5dd5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -578,6 +578,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0819-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0819-Add-PlayerStopUsingItemEvent.patch index 243893434d..e5cf7e8302 100644 --- a/patches/unapplied/server/0819-Add-PlayerStopUsingItemEvent.patch +++ b/patches/unapplied/server/0819-Add-PlayerStopUsingItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d559d34524e84e7cb5a59756214eac6c9658bd87..0fb20d8680210b91c33aeea4ceae96be536f983b 100644 +index 50ee81007ae10f68aa40a666605203862f5e20a8..418853323314597f746b2f8e74b9766efcbf98be 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3976,6 +3976,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch index 3db6047425..8d06a57105 100644 --- a/patches/unapplied/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/unapplied/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bb36a5c934252ce11c2705e676ecb943d362fcd4..0a5ab47ecbfa4c7d1653fdc4b918387a1389f42e 100644 +index 42bb941af5eac6e4a4d79a59be9e1ac56468c4b4..5c4a4b7efff2a00d7a35d902b4e18e02d4489122 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2037,7 +2037,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0846-More-Teleport-API.patch b/patches/unapplied/server/0846-More-Teleport-API.patch index 782c5a3664..5ddfdd9480 100644 --- a/patches/unapplied/server/0846-More-Teleport-API.patch +++ b/patches/unapplied/server/0846-More-Teleport-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 502ee7d0629b2b2e9b2513beb9b4e2fee3e6966f..12b7cc8bb261888e8686b8fdd1db9cf44f1dbb65 100644 +index f876cd2320788570137d9f59411bf7e908e9e81b..13e5c0bc9e3cef3dd68f2d415649a183583eb606 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1713,11 +1713,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -74,7 +74,7 @@ index f61d3cd3cdbfe17f6818fbbb163f80ba3de50ca1..df554fa92065bc4c8566a9638f4f6f6c // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 488b92974ac42b08478c0afd9b6115afe4996dc7..87e749a6843dc935ddafc4beaab6996af5beb167 100644 +index 166c7d1c23862b65b332ca6573a2a75c5926c9e8..5ad3f284f0d25ec4f7ea8789c2205f88b349f715 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1210,13 +1210,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0848-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0848-Don-t-use-level-random-in-entity-constructors.patch index a28684e045..502d940d75 100644 --- a/patches/unapplied/server/0848-Don-t-use-level-random-in-entity-constructors.patch +++ b/patches/unapplied/server/0848-Don-t-use-level-random-in-entity-constructors.patch @@ -31,7 +31,7 @@ index e06d5eea4bc81be264a1f5d5fad2d4548c4ae8d2..55026e1731e41b4e3e4c6a8fef5d96a3 } diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 3b8c76a89249ea4edcae4b59f1fe828f584fb1c1..f9c2274c060efdd9b6627ced8485b766aca8951c 100644 +index 6b3a17e6717b8c03c5bd674771b29e4becd42c71..22d29a2e58c5615dcee04ba68752fb76489c8a28 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -64,7 +64,12 @@ public class ItemEntity extends Entity implements TraceableEntity { diff --git a/patches/unapplied/server/0849-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0849-Send-block-entities-after-destroy-prediction.patch index 99d0cf6308..c384f99210 100644 --- a/patches/unapplied/server/0849-Send-block-entities-after-destroy-prediction.patch +++ b/patches/unapplied/server/0849-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 12b7cc8bb261888e8686b8fdd1db9cf44f1dbb65..7bb601078ef3a983d1807246b91b669ae5d5a8e4 100644 +index 13e5c0bc9e3cef3dd68f2d415649a183583eb606..bf73cdaa4f05e4415b9d072ad46774361deddad8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1859,8 +1859,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0851-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0851-Custom-Chat-Completion-Suggestions-API.patch index 747b46180d..026ed506e9 100644 --- a/patches/unapplied/server/0851-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/unapplied/server/0851-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 87e749a6843dc935ddafc4beaab6996af5beb167..a95f9aa48f50eaa0d32c5e87e35d53436bbb56e1 100644 +index 5ad3f284f0d25ec4f7ea8789c2205f88b349f715..d4fd2fa83d1d8e9d97465b92edd913c05d20c69c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -650,6 +650,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0859-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0859-Fix-plugin-loggers-on-server-shutdown.patch index 0f3e2f5937..a9f67b4715 100644 --- a/patches/unapplied/server/0859-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/unapplied/server/0859-Fix-plugin-loggers-on-server-shutdown.patch @@ -49,7 +49,7 @@ index 42f566c9155b70e04d457eb05934d678a92fcdb1..f1b8ebb9718c8ff824d2707a0d1eb08c // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 2dca21932c5c97a13c77a559400f0d01eba42c34..bfa091f72d6f477bcaf63d364639a1b4df9b1987 100644 +index 3250274384fabb11e241837007e543cb81dd3b6d..2b27feda982ca55257b55c801ec772a18157bd01 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -18,6 +18,12 @@ public class Main { diff --git a/patches/unapplied/server/0860-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0860-Stop-large-look-changes-from-crashing-the-server.patch index 5660492c3c..75b0e56e42 100644 --- a/patches/unapplied/server/0860-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/unapplied/server/0860-Stop-large-look-changes-from-crashing-the-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server Co-authored-by: Jaren Knodel diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0fb20d8680210b91c33aeea4ceae96be536f983b..79f989f2331ce3276b46ec4436a8db83f1f1f8b2 100644 +index 418853323314597f746b2f8e74b9766efcbf98be..66a2ae4b03a99613be03458dab23a904956fcfee 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3027,37 +3027,15 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0878-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0878-Elder-Guardian-appearance-API.patch index dc4e1ca9f7..077435aa0c 100644 --- a/patches/unapplied/server/0878-Elder-Guardian-appearance-API.patch +++ b/patches/unapplied/server/0878-Elder-Guardian-appearance-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a95f9aa48f50eaa0d32c5e87e35d53436bbb56e1..24d8de19bd29cb318e8da8644fce454398bb8d38 100644 +index d4fd2fa83d1d8e9d97465b92edd913c05d20c69c..d3897174efde2f304f5a92772d5218961c561246 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3154,6 +3154,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0881-Detect-headless-JREs.patch b/patches/unapplied/server/0881-Detect-headless-JREs.patch index c5941b2f1e..1f6e2abca2 100644 --- a/patches/unapplied/server/0881-Detect-headless-JREs.patch +++ b/patches/unapplied/server/0881-Detect-headless-JREs.patch @@ -27,7 +27,7 @@ index 6bd0afddbcc461149dfe9a5c7a86fff6ea13a5f1..148d233f4f5278ff39eacdaa0f4f0e7d + } } diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 3a27a33899a10745b79ea263d686389ddf4bb5a4..adfec92fe5eed20336bfb82aba60ab7f3498b9dd 100644 +index 0303b7f80fe0939ce1e50cdfd3d93456f09a8259..c1a492827bbde63dd464402767d4c6a2cdf689eb 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -181,6 +181,18 @@ public class Main { diff --git a/patches/unapplied/server/0895-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0895-Add-Player-Warden-Warning-API.patch index a187af4d34..9f63afc2fa 100644 --- a/patches/unapplied/server/0895-Add-Player-Warden-Warning-API.patch +++ b/patches/unapplied/server/0895-Add-Player-Warden-Warning-API.patch @@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 24d8de19bd29cb318e8da8644fce454398bb8d38..ea08282554954e838bf8ebb00744bf103b9da5d7 100644 +index d3897174efde2f304f5a92772d5218961c561246..0ccfced204aaaece005238c16cc0b50486859c60 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3159,6 +3159,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0898-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0898-check-global-player-list-where-appropriate.patch index 7647acbf1c..1d57a4ceba 100644 --- a/patches/unapplied/server/0898-check-global-player-list-where-appropriate.patch +++ b/patches/unapplied/server/0898-check-global-player-list-where-appropriate.patch @@ -24,7 +24,7 @@ index 5bdae591d344fc9b72ffcc1a44fb5e495b1e6bb2..37873ea2876a89ac8ea702ab0a71171e + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 79f989f2331ce3276b46ec4436a8db83f1f1f8b2..f5eb57cf35a11d135e3bf998d1cb1ce06fc360ce 100644 +index 66a2ae4b03a99613be03458dab23a904956fcfee..1ed68dc816964bc1bff7cc705dc738fc1c65efc9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3613,7 +3613,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0901-Friction-API.patch b/patches/unapplied/server/0901-Friction-API.patch index ccd49c453f..ec62df49f5 100644 --- a/patches/unapplied/server/0901-Friction-API.patch +++ b/patches/unapplied/server/0901-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f5eb57cf35a11d135e3bf998d1cb1ce06fc360ce..279d3ff3e1568fdf396faf635854e5f83e2bb209 100644 +index 1ed68dc816964bc1bff7cc705dc738fc1c65efc9..6a50f553753d4a7c596ad081c6bb3557afa884d6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0906-Limit-pet-look-distance.patch b/patches/unapplied/server/0906-Limit-pet-look-distance.patch index 144e4e1680..6b827724a3 100644 --- a/patches/unapplied/server/0906-Limit-pet-look-distance.patch +++ b/patches/unapplied/server/0906-Limit-pet-look-distance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit pet look distance diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java -index 11cc26954b4e97114b59df35a4f9b75a09132e20..8e1c60d3622bf069feec5e636d2a5b4257e11776 100644 +index 0a3f7dcc0e205a85dbaa6dee1fc9ae2c7fa9e02d..689bbc0feb700cfd6b10601d2c5a237ec40ed756 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/FollowOwnerGoal.java @@ -93,7 +93,7 @@ public class FollowOwnerGoal extends Goal { diff --git a/patches/unapplied/server/0909-fix-Instruments.patch b/patches/unapplied/server/0909-fix-Instruments.patch index be861ecff0..8e5cbc33a3 100644 --- a/patches/unapplied/server/0909-fix-Instruments.patch +++ b/patches/unapplied/server/0909-fix-Instruments.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments properly handle Player#playNote diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ea08282554954e838bf8ebb00744bf103b9da5d7..9e5c56c8ca9d7b3ba5484686e2fbedf6dc3fedcb 100644 +index 0ccfced204aaaece005238c16cc0b50486859c60..c9775b294dd6982d5064f3553fab1f0f0a667121 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -724,29 +724,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0917-Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/0917-Add-missing-SpigotConfig-logCommands-check.patch index 241343c4cc..e69955de56 100644 --- a/patches/unapplied/server/0917-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/unapplied/server/0917-Add-missing-SpigotConfig-logCommands-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d7a4e200853f4eb980f1ea4a5c6a338039979cf1..4434cad1a854fb514245c4afb3e3d469efb223f9 100644 +index ef702b934f75578900b7b3d0156c3ede7411aa4d..771341996a41723cceb945e18ac8b5adae337d91 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2259,7 +2259,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0919-Flying-Fall-Damage.patch b/patches/unapplied/server/0919-Flying-Fall-Damage.patch index df573bec28..dbc0fbe09e 100644 --- a/patches/unapplied/server/0919-Flying-Fall-Damage.patch +++ b/patches/unapplied/server/0919-Flying-Fall-Damage.patch @@ -26,7 +26,7 @@ index 53487f0a4fe672298c3b83d24a2a603641afcde8..58152160d609d0e9d105153aeb166a56 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9e5c56c8ca9d7b3ba5484686e2fbedf6dc3fedcb..05d9dc64d2827904f1cbb00d5a1710af89852f76 100644 +index c9775b294dd6982d5064f3553fab1f0f0a667121..e50651a0c9f856d0cfca3b8ee3b664f19393690f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2376,6 +2376,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch index 415df71963..7bd40499d3 100644 --- a/patches/unapplied/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/unapplied/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 279d3ff3e1568fdf396faf635854e5f83e2bb209..849c1245333f11a1a89e895db24f72f4e878a8b3 100644 +index 6a50f553753d4a7c596ad081c6bb3557afa884d6..634d272b71c464b9279a7e3ba83e9eacfcff580b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1582,7 +1582,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0925-Win-Screen-API.patch b/patches/unapplied/server/0925-Win-Screen-API.patch index 857f4223a3..b81b205c58 100644 --- a/patches/unapplied/server/0925-Win-Screen-API.patch +++ b/patches/unapplied/server/0925-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 05d9dc64d2827904f1cbb00d5a1710af89852f76..d828ac224f07ec6992c48a19bcd4e189783d2bcb 100644 +index e50651a0c9f856d0cfca3b8ee3b664f19393690f..241cc7dda1de8c711050b269b74b1b74adef5fce 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1213,6 +1213,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0935-Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/0935-Fix-advancement-triggers-for-entity-damage.patch index 3f0d2bec14..d08ebfb22a 100644 --- a/patches/unapplied/server/0935-Fix-advancement-triggers-for-entity-damage.patch +++ b/patches/unapplied/server/0935-Fix-advancement-triggers-for-entity-damage.patch @@ -23,7 +23,7 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a return !this.getResponse(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 849c1245333f11a1a89e895db24f72f4e878a8b3..bed4490bb87b51867c555313163a6b148458f0e0 100644 +index 634d272b71c464b9279a7e3ba83e9eacfcff580b..cf3173c3b3d3362040eb57ee39221e24a5bc5221 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2273,7 +2273,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0937-Fix-certain-inventories-returning-null-Locations.patch b/patches/unapplied/server/0937-Fix-certain-inventories-returning-null-Locations.patch index 1de62b0418..ade77c6c91 100644 --- a/patches/unapplied/server/0937-Fix-certain-inventories-returning-null-Locations.patch +++ b/patches/unapplied/server/0937-Fix-certain-inventories-returning-null-Locations.patch @@ -30,7 +30,7 @@ index e938e46a142f3764f8224a1fd035e7d541b59c56..9d1ee40456a8d7001eee654a62e62cab } diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java -index 335d0a85378c04dd466fafd42048b2474c815cb9..fb1d71143a0344432af9dc5c3085e217a2778f10 100644 +index f984af71fc034e09147fa339bd5f260a7466e127..46fd2f45923366c38b77270a45c80b31250ae37e 100644 --- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java +++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java @@ -49,6 +49,12 @@ public class BeaconMenu extends AbstractContainerMenu { diff --git a/patches/unapplied/server/0944-Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/0944-Treat-sequence-violations-like-they-should-be.patch index 6a9d447d48..06bfe83541 100644 --- a/patches/unapplied/server/0944-Treat-sequence-violations-like-they-should-be.patch +++ b/patches/unapplied/server/0944-Treat-sequence-violations-like-they-should-be.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ce13cd909e50fcc1b63c0a515f18fd1fbd4f6aea..4b8a1dd566601059f77b61b8df0c6ba8d211fed3 100644 +index 5cb45e6e5f73996b2a603589b8571cf0155a42c5..419979939efcf83f03edab522b4360c9d2c03fe3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2129,6 +2129,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch index e069ae4523..fd442567f7 100644 --- a/patches/unapplied/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch +++ b/patches/unapplied/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix demo flag not enabling demo mode https://github.com/PaperMC/Paper/issues/9046 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index adfec92fe5eed20336bfb82aba60ab7f3498b9dd..831a43b7fb193e40a0d0c022b397889bf010ac57 100644 +index c1a492827bbde63dd464402767d4c6a2cdf689eb..a7ebf851a65231074c89a24f30de4ac2fb5b63e4 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -312,7 +312,7 @@ public class Main { diff --git a/patches/unapplied/server/0959-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0959-Expand-PlayerItemMendEvent.patch index 961cbe0ae5..f81fa73e47 100644 --- a/patches/unapplied/server/0959-Expand-PlayerItemMendEvent.patch +++ b/patches/unapplied/server/0959-Expand-PlayerItemMendEvent.patch @@ -33,7 +33,7 @@ index 8d8fe55a05eea237a8af99ed15ab16d6167daa77..eca634792d2a7cc649675e3394e84dba return k > 0 ? this.repairPlayerItems(player, k) : 0; } else { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d828ac224f07ec6992c48a19bcd4e189783d2bcb..6497a2546dac6a577b66bc43fc0b3af277000ad8 100644 +index 241cc7dda1de8c711050b269b74b1b74adef5fce..5be4d15ac3df989339c586bbeb8148b1b41d47d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1735,11 +1735,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/unapplied/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch index feabe3c0cf..482200ce18 100644 --- a/patches/unapplied/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch +++ b/patches/unapplied/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 300201c2bb64fff5df85f0d10d67e31536336f3a..d3d34bc806ccd4492cf19c42f8c3c7a4d2672576 100644 +index 2b27feda982ca55257b55c801ec772a18157bd01..7c29d92362a82330440dff151bcf421f15c68f71 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -367,6 +367,7 @@ public class Main { diff --git a/patches/unapplied/server/0971-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/0971-Folia-scheduler-and-owned-region-API.patch index 0b3c35bf55..3ba4ace0e0 100644 --- a/patches/unapplied/server/0971-Folia-scheduler-and-owned-region-API.patch +++ b/patches/unapplied/server/0971-Folia-scheduler-and-owned-region-API.patch @@ -1224,7 +1224,7 @@ index cf9393dd02565134a1ce428e84a9f26ac2d39a0d..e19010627a030753b08aa8451363c6bc public void setLevelCallback(EntityInLevelCallback changeListener) { this.levelCallback = changeListener; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 144e843191bc955d37ee1524746304fbe0d79149..d62cdda5ef3691a54ce34729920bad8e16c7a883 100644 +index 1d62b3fa7cfbb891b7a1fda01a22f64a6bc1968e..47e36ad27761dd6b2e2ef1b86664fa3b3c84865d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -306,6 +306,76 @@ public final class CraftServer implements Server { diff --git a/patches/unapplied/server/0973-Properly-Cancel-Usable-Items.patch b/patches/unapplied/server/0973-Properly-Cancel-Usable-Items.patch index 9e43caa79e..a905598380 100644 --- a/patches/unapplied/server/0973-Properly-Cancel-Usable-Items.patch +++ b/patches/unapplied/server/0973-Properly-Cancel-Usable-Items.patch @@ -34,7 +34,7 @@ index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae return enuminteractionresult; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3876bcddb3ab69aee1feb0fe19cb343e097a6824..f61b6e0eea4132347ced3c7c18d027337f8e6b15 100644 +index f6ba77a7c43a6a030fe4073ba7ee2970e7d774f3..c80aaaea583f87143dab2a4d314b8b3f83d8bbf6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2031,6 +2031,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -46,7 +46,7 @@ index 3876bcddb3ab69aee1feb0fe19cb343e097a6824..f61b6e0eea4132347ced3c7c18d02733 return; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bed4490bb87b51867c555313163a6b148458f0e0..7763450e85146d43fcf84d380d0e7a8183d83747 100644 +index cf3173c3b3d3362040eb57ee39221e24a5bc5221..78c98f38bc263664ea4cd344670243a7d372885c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3748,6 +3748,12 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied/server/0985-Fix-BanList-API.patch b/patches/unapplied/server/0985-Fix-BanList-API.patch index ac50f25bb8..af9980a986 100644 --- a/patches/unapplied/server/0985-Fix-BanList-API.patch +++ b/patches/unapplied/server/0985-Fix-BanList-API.patch @@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6497a2546dac6a577b66bc43fc0b3af277000ad8..6b7680b4062f0189a587b2fcfc93f30b57e29a9e 100644 +index 5be4d15ac3df989339c586bbeb8148b1b41d47d4..21b112f69b747e44b6cc9136ac11089258b55537 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1633,23 +1633,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/0994-Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/0994-Implement-PlayerFailMoveEvent.patch index 6b40e03c8e..68ec6226d6 100644 --- a/patches/unapplied/server/0994-Implement-PlayerFailMoveEvent.patch +++ b/patches/unapplied/server/0994-Implement-PlayerFailMoveEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f61b6e0eea4132347ced3c7c18d027337f8e6b15..721243ebf0fb126cf5c0de76c6bd990807f097f4 100644 +index c80aaaea583f87143dab2a4d314b8b3f83d8bbf6..2eb497b87ac02a97242073cfdaad08019d68a47e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1406,8 +1406,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/1005-Bandaid-fix-for-Effect.patch b/patches/unapplied/server/1005-Bandaid-fix-for-Effect.patch index 25740e20be..40e1c22cb9 100644 --- a/patches/unapplied/server/1005-Bandaid-fix-for-Effect.patch +++ b/patches/unapplied/server/1005-Bandaid-fix-for-Effect.patch @@ -58,7 +58,7 @@ index 550dcb7d595221b221e4710890d8a3cad789fc07..f857f490ffba2f25f7c06c5fb1a1905f // Special case: the axis is optional for ELECTRIC_SPARK Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6b7680b4062f0189a587b2fcfc93f30b57e29a9e..c9e4a2635c421df192f62c0903659347bce677f9 100644 +index 21b112f69b747e44b6cc9136ac11089258b55537..0aab08552b4810b4ae699601662f7b2b6f5a0220 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -860,7 +860,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/unapplied/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch index 98c664c42d..f84aa864cd 100644 --- a/patches/unapplied/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch +++ b/patches/unapplied/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch @@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player requests tab-complete only commands. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 721243ebf0fb126cf5c0de76c6bd990807f097f4..e8923befdee3514be5346c6e6c8e7236e7e6e668 100644 +index 2eb497b87ac02a97242073cfdaad08019d68a47e..4871b8fd48cdae2bf65323e3bd716a8124b2ff6f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -920,6 +920,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/1014-Add-Listing-API-for-Player.patch b/patches/unapplied/server/1014-Add-Listing-API-for-Player.patch index 2d1e815666..8fd5b1805d 100644 --- a/patches/unapplied/server/1014-Add-Listing-API-for-Player.patch +++ b/patches/unapplied/server/1014-Add-Listing-API-for-Player.patch @@ -113,7 +113,7 @@ index 640e9bd618dc8286933318744c2064ede1fd9b5f..f097ec5b4e3ad6b1a7c464a8cff4f8b2 // Paper end player.sentListPacket = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c9e4a2635c421df192f62c0903659347bce677f9..472705e92cef5802f377637d8ea5c8001d7a185c 100644 +index 0aab08552b4810b4ae699601662f7b2b6f5a0220..d1c019ea4fc500b0f33affa44bad6718296bcee0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/unapplied/server/1020-Add-PlayerPickItemEvent.patch b/patches/unapplied/server/1020-Add-PlayerPickItemEvent.patch index 2efbf85a5b..07e7ae68c9 100644 --- a/patches/unapplied/server/1020-Add-PlayerPickItemEvent.patch +++ b/patches/unapplied/server/1020-Add-PlayerPickItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e8923befdee3514be5346c6e6c8e7236e7e6e668..3c0651fa5a5db880202c9a3805a6455269c5f16d 100644 +index 4871b8fd48cdae2bf65323e3bd716a8124b2ff6f..ab58827001b3b42e44d7f701c390480fed1fa1f1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1057,7 +1057,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/unapplied/server/1025-Implement-OfflinePlayer-isConnected.patch b/patches/unapplied/server/1025-Implement-OfflinePlayer-isConnected.patch index 8456895bbb..08417ab7cb 100644 --- a/patches/unapplied/server/1025-Implement-OfflinePlayer-isConnected.patch +++ b/patches/unapplied/server/1025-Implement-OfflinePlayer-isConnected.patch @@ -23,7 +23,7 @@ index c6129dc565b8f874b73e2fefcabd4be1c221fd73..c1b874cd6e0498fce3cd53fdbaca30d2 public String getName() { Player player = this.getPlayer(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 472705e92cef5802f377637d8ea5c8001d7a185c..4e6fea7cf11b1e29ae7c7098a6f5d06bb5f93cc2 100644 +index d1c019ea4fc500b0f33affa44bad6718296bcee0..3d5876cbadb5c8c02de751c3e15fc7f251ea7d35 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -272,6 +272,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {