diff --git a/patches/server/0723-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0694-Improve-and-expand-AsyncCatcher.patch similarity index 61% rename from patches/server/0723-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0694-Improve-and-expand-AsyncCatcher.patch index 38f61896e0..f2dbf0199e 100644 --- a/patches/server/0723-Async-catch-modifications-to-critical-entity-state.patch +++ b/patches/server/0694-Improve-and-expand-AsyncCatcher.patch @@ -1,12 +1,46 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf -Date: Sun, 31 Oct 2021 21:34:00 -0700 -Subject: [PATCH] Async catch modifications to critical entity state +Date: Wed, 25 Aug 2021 20:17:12 -0700 +Subject: [PATCH] Improve and expand AsyncCatcher -These used to be here from Spigot, but were dropped with 1.17. -Now in 1.17, this state is _even more_ critical than it was before, -so these must exist to catch stupid plugins. +Log when the async catcher is tripped + The chunk system can swallow the exception given it's all + built with completablefuture, so ensure it is at least printed. +Add/move several async catchers + +Async catch modifications to critical entity state + These used to be here from Spigot, but were dropped with 1.17. + Now in 1.17, this state is _even more_ critical than it was before, + so these must exist to catch stupid plugins. + +Co-authored-by: Jake Potrebic + +diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +index 96897ccce68ecbff808077a07f213daccc57fa54..f2a96d282f65e405e8e396ef271ce0d5a094ac4b 100644 +--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java ++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +@@ -1652,6 +1652,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic + } + + public void internalTeleport(double d0, double d1, double d2, float f, float f1, Set set) { // Paper ++ org.spigotmc.AsyncCatcher.catchOp("teleport"); // Paper + // Paper start + if (player.isRemoved()) { + LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName()); +diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java +index a7046e42c1935e9a4e529726072d9f88caaa703a..7d100539ffd1c52c4bf514907a0cb1d848eb0236 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -1102,7 +1102,7 @@ public abstract class LivingEntity extends Entity implements Attackable { + } + + public boolean addEffect(MobEffectInstance mobeffect, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause) { +- org.spigotmc.AsyncCatcher.catchOp("effect add"); // Spigot ++ // org.spigotmc.AsyncCatcher.catchOp("effect add"); // Spigot // Paper - move to API + if (this.isTickingEffects) { + this.effectsToProcess.add(new ProcessableEffect(mobeffect, cause)); + return true; diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java index 038abf2ac104ceecaab11b10d466ea69ec86623e..a77985b2dd7137d8eea03909403fc08e89376d73 100644 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java @@ -131,3 +165,27 @@ index 038abf2ac104ceecaab11b10d466ea69ec86623e..a77985b2dd7137d8eea03909403fc08e if (!this.currentSection.remove(this.entity)) { PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason}); } +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +index cbb6b437358823cd52518682f32dd597c9aeb85a..205101e301bb4ea552459fe4e1f028f252136720 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +@@ -455,6 +455,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + + @Override + public boolean addPotionEffect(PotionEffect effect, boolean force) { ++ org.spigotmc.AsyncCatcher.catchOp("effect add"); // Paper + this.getHandle().addEffect(new MobEffectInstance(MobEffect.byId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles(), effect.hasIcon()), EntityPotionEffectEvent.Cause.PLUGIN); // Paper - Don't ignore icon + return true; + } +diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java +index 5409f230fdd53b70fc03c58177438534731ad4e6..c02a04d284734b5f545b64307ed4aea337c1465f 100644 +--- a/src/main/java/org/spigotmc/AsyncCatcher.java ++++ b/src/main/java/org/spigotmc/AsyncCatcher.java +@@ -12,6 +12,7 @@ public class AsyncCatcher + { + if ( !io.papermc.paper.util.TickThread.isTickThread() ) // Paper // Paper - rewrite chunk system + { ++ MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); // Paper + throw new IllegalStateException( "Asynchronous " + reason + "!" ); + } + } diff --git a/patches/server/0694-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0694-Log-when-the-async-catcher-is-tripped.patch deleted file mode 100644 index b2c6aee8dc..0000000000 --- a/patches/server/0694-Log-when-the-async-catcher-is-tripped.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Spottedleaf -Date: Wed, 25 Aug 2021 20:17:12 -0700 -Subject: [PATCH] Log when the async catcher is tripped - -The chunk system can swallow the exception given it's all -built with completablefuture, so ensure it is at least printed. - -diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 5409f230fdd53b70fc03c58177438534731ad4e6..c02a04d284734b5f545b64307ed4aea337c1465f 100644 ---- a/src/main/java/org/spigotmc/AsyncCatcher.java -+++ b/src/main/java/org/spigotmc/AsyncCatcher.java -@@ -12,6 +12,7 @@ public class AsyncCatcher - { - if ( !io.papermc.paper.util.TickThread.isTickThread() ) // Paper // Paper - rewrite chunk system - { -+ MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); // Paper - throw new IllegalStateException( "Asynchronous " + reason + "!" ); - } - } diff --git a/patches/server/0724-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0724-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0725-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0725-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0726-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0725-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0726-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0725-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0727-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0727-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 2ed3efebb6..87b14a935b 100644 --- a/patches/server/0727-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0726-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 96897ccce68ecbff808077a07f213daccc57fa54..bfc9fff1d9b397ea2ef5057bbb6ba897e234dc5c 100644 +index f2a96d282f65e405e8e396ef271ce0d5a094ac4b..f739357b5c304c06de6bab20a0dc9cb438c33fc1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -837,6 +837,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0728-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0728-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0729-Ensure-valid-vehicle-status.patch b/patches/server/0728-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0729-Ensure-valid-vehicle-status.patch rename to patches/server/0728-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0730-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0729-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0730-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0729-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0731-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0731-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0732-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0731-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0732-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0731-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0733-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0732-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0733-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0732-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0734-Preserve-overstacked-loot.patch b/patches/server/0733-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0734-Preserve-overstacked-loot.patch rename to patches/server/0733-Preserve-overstacked-loot.patch diff --git a/patches/server/0735-Update-head-rotation-in-missing-places.patch b/patches/server/0734-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0735-Update-head-rotation-in-missing-places.patch rename to patches/server/0734-Update-head-rotation-in-missing-places.patch index 852619d604..d4cc481e2c 100644 --- a/patches/server/0735-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0734-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2b3be52e421f21ed4736c9e9093c038d82ded227..47c51e8490abd10f0ff04efabea3681375589c56 100644 +index d87e9e252056d9dea6748f54847434468a0111df..5e0a7aa0e9fb1350964d17e3f5904c4ec3922ff9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1783,6 +1783,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0736-prevent-unintended-light-block-manipulation.patch b/patches/server/0735-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0736-prevent-unintended-light-block-manipulation.patch rename to patches/server/0735-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0737-Fix-CraftCriteria-defaults-map.patch b/patches/server/0736-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0737-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0736-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0738-Fix-upstreams-block-state-factories.patch b/patches/server/0737-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0738-Fix-upstreams-block-state-factories.patch rename to patches/server/0737-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0739-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0738-Add-config-option-for-logging-player-ip-addresses.patch similarity index 97% rename from patches/server/0739-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0738-Add-config-option-for-logging-player-ip-addresses.patch index 5264c915a6..6d70eb87b6 100644 --- a/patches/server/0739-Add-config-option-for-logging-player-ip-addresses.patch +++ b/patches/server/0738-Add-config-option-for-logging-player-ip-addresses.patch @@ -47,7 +47,7 @@ index 595779cfd0ee1c405d7936f00a7cae1706125e7f..ed3af916dfa875dd0a5f1e730d20d11e @Override diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index d84b976364b0ffc4b7356c6791d70f0e34deff48..9f73627c20d341afc57f287019e40bbbe574733e 100644 +index 9848b4e62692c5044544710c93c099558fcbf1e6..db746a44c631380ff6bdf7a37d86d2e09877db88 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -245,7 +245,7 @@ public abstract class PlayerList { diff --git a/patches/server/0740-Configurable-feature-seeds.patch b/patches/server/0739-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0740-Configurable-feature-seeds.patch rename to patches/server/0739-Configurable-feature-seeds.patch diff --git a/patches/server/0741-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0741-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0742-Add-root-admin-user-detection.patch b/patches/server/0741-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0742-Add-root-admin-user-detection.patch rename to patches/server/0741-Add-root-admin-user-detection.patch diff --git a/patches/server/0743-Always-allow-item-changing-in-Fireball.patch b/patches/server/0742-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0743-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0742-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0744-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0743-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0744-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0743-don-t-attempt-to-teleport-dead-entities.patch index 35ca04756f..62d8916cc8 100644 --- a/patches/server/0744-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0743-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 47c51e8490abd10f0ff04efabea3681375589c56..73d475788e23d371c79908c792d8d4dd0ba770ab 100644 +index 5e0a7aa0e9fb1350964d17e3f5904c4ec3922ff9..45eeef03ab3c885b4fbc332287089e9cc5d85afa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -780,7 +780,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0745-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 94% rename from patches/server/0745-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch index 02e3bd8ef0..af6c120dbc 100644 --- a/patches/server/0745-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0744-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 f1cb4aa51edd1500b3ddd1f2457b905db8802900..36290f1fa97a543a45fae61a8548c95415abc900 100644 +index 7d100539ffd1c52c4bf514907a0cb1d848eb0236..af9a16469df62b0ea9f1d35bcc30407f5e000646 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2614,14 +2614,27 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0746-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0746-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0747-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0747-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0748-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0747-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0748-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0747-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0749-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 97% rename from patches/server/0749-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch index c404d207e8..48441b76ce 100644 --- a/patches/server/0749-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,7 +34,7 @@ index 6dddd4eb8de9a08461245e35e65d4106f4e8e729..3e8255898e8afdd1127eea79338d5cc5 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 36290f1fa97a543a45fae61a8548c95415abc900..c92db10a6ee95753d71526da2d7e29045de87b85 100644 +index af9a16469df62b0ea9f1d35bcc30407f5e000646..3e8d283a8312ac299bf0e260d75154ba8208d023 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3126,7 +3126,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0750-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0749-Hide-unnecessary-itemmeta-from-clients.patch similarity index 96% rename from patches/server/0750-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0749-Hide-unnecessary-itemmeta-from-clients.patch index 662c2dcff3..58e8000fc9 100644 --- a/patches/server/0750-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0749-Hide-unnecessary-itemmeta-from-clients.patch @@ -18,10 +18,10 @@ index 3e8255898e8afdd1127eea79338d5cc54502be76..fc187be6b3fb7bc9fa97d1ebcbe92294 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bfc9fff1d9b397ea2ef5057bbb6ba897e234dc5c..5e34d42ba53d90f35e072c9f6cd6c6d714de5c21 100644 +index f739357b5c304c06de6bab20a0dc9cb438c33fc1..ee5ef598250ed02dbb44eb4240cb5b2521e33520 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2697,8 +2697,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2698,8 +2698,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // Refresh the current entity metadata entity.getEntityData().refresh(player); // SPIGOT-7136 - Allays @@ -33,7 +33,7 @@ index bfc9fff1d9b397ea2ef5057bbb6ba897e234dc5c..5e34d42ba53d90f35e072c9f6cd6c6d7 } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c92db10a6ee95753d71526da2d7e29045de87b85..15c00d3dc8cab6968703d0420600aa77b2ffbec5 100644 +index 3e8d283a8312ac299bf0e260d75154ba8208d023..b167d83abee37d64f8ef5865b9407bf1d2237ea1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3128,7 +3128,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0751-Fix-Spigot-growth-modifiers.patch b/patches/server/0750-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0751-Fix-Spigot-growth-modifiers.patch rename to patches/server/0750-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0752-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0752-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0753-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0752-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0753-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0752-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0754-Add-player-health-update-API.patch b/patches/server/0753-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0754-Add-player-health-update-API.patch rename to patches/server/0753-Add-player-health-update-API.patch diff --git a/patches/server/0755-Optimize-HashMapPalette.patch b/patches/server/0754-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0755-Optimize-HashMapPalette.patch rename to patches/server/0754-Optimize-HashMapPalette.patch diff --git a/patches/server/0756-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 98% rename from patches/server/0756-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch index 54f1beadb2..b8ccb2e67d 100644 --- a/patches/server/0756-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e3aef13c8b432b46690daf3b27e95b8623ae0aca..1e54fc63253a12f2dbc248965d0027e526a3cc86 100644 +index c9e643ca1a2fab8a314e5f232903b3a54bfd0a76..c997788550f03e3441fc879e281eb54f64a44f01 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2337,6 +2337,90 @@ public final class CraftServer implements Server { diff --git a/patches/server/0757-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0757-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index fafb2e65ce..2444d3b084 100644 --- a/patches/server/0757-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1202,7 +1202,7 @@ index d9719e544261b9d2dc85fa9936ae23ea8e8dd08c..5afb17ccc16e614e91ff3cad2f714b4a } } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 9f73627c20d341afc57f287019e40bbbe574733e..85d5efe606f71d729fb1b1271d661b205a0ae324 100644 +index db746a44c631380ff6bdf7a37d86d2e09877db88..8d64bd67bff3403b53c2ac98fc7be20310c847b8 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -885,7 +885,7 @@ public abstract class PlayerList { diff --git a/patches/server/0758-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0758-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch index 854fb7d278..f661e86237 100644 --- a/patches/server/0758-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5e34d42ba53d90f35e072c9f6cd6c6d714de5c21..e18e2ef7846a49e24411adf571b25d37e068c3fe 100644 +index ee5ef598250ed02dbb44eb4240cb5b2521e33520..302582a20700fbea302886115143bd25099e0d51 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -645,7 +645,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0759-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0759-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0760-Add-more-Campfire-API.patch b/patches/server/0759-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0760-Add-more-Campfire-API.patch rename to patches/server/0759-Add-more-Campfire-API.patch diff --git a/patches/server/0761-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0761-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0762-Fix-tripwire-state-inconsistency.patch b/patches/server/0761-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0762-Fix-tripwire-state-inconsistency.patch rename to patches/server/0761-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0763-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0762-Forward-CraftEntity-in-teleport-command.patch similarity index 95% rename from patches/server/0763-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0762-Forward-CraftEntity-in-teleport-command.patch index 2c636fef1b..6dddb78633 100644 --- a/patches/server/0763-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0762-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 182e443e4cd114edeb0c0c6be5dda76d49346da3..bd8e756bf1e74cdc75cc12d2368a6fe702a759ad 100644 +index 63802f5304f23a6e1e469e383692376d1f4d8f0d..374ba7c9a088bc56ec1da96902aab3c81889c64d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3330,6 +3330,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0764-Improve-scoreboard-entries.patch b/patches/server/0763-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0764-Improve-scoreboard-entries.patch rename to patches/server/0763-Improve-scoreboard-entries.patch diff --git a/patches/server/0765-Entity-powdered-snow-API.patch b/patches/server/0764-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0765-Entity-powdered-snow-API.patch rename to patches/server/0764-Entity-powdered-snow-API.patch diff --git a/patches/server/0766-Add-API-for-item-entity-health.patch b/patches/server/0765-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0766-Add-API-for-item-entity-health.patch rename to patches/server/0765-Add-API-for-item-entity-health.patch diff --git a/patches/server/0767-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0767-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0768-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0767-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0768-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0767-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0769-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0769-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0770-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0770-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0771-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0771-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0772-Fix-bees-aging-inside-hives.patch b/patches/server/0771-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0772-Fix-bees-aging-inside-hives.patch rename to patches/server/0771-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0773-Bucketable-API.patch b/patches/server/0772-Bucketable-API.patch similarity index 100% rename from patches/server/0773-Bucketable-API.patch rename to patches/server/0772-Bucketable-API.patch diff --git a/patches/server/0774-Validate-usernames.patch b/patches/server/0773-Validate-usernames.patch similarity index 97% rename from patches/server/0774-Validate-usernames.patch rename to patches/server/0773-Validate-usernames.patch index 85008fc524..1fddb7cd27 100644 --- a/patches/server/0774-Validate-usernames.patch +++ b/patches/server/0773-Validate-usernames.patch @@ -56,7 +56,7 @@ index ed3af916dfa875dd0a5f1e730d20d11efd6419c6..cd4e76fe5b79c7d9e615b4886a568c74 if (gameprofile != null && packet.name().equalsIgnoreCase(gameprofile.getName())) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 85d5efe606f71d729fb1b1271d661b205a0ae324..7b3b5a9bd7bfdec08998f75026fe8d3b8a2a9a42 100644 +index 8d64bd67bff3403b53c2ac98fc7be20310c847b8..4206caa7660611dfbeaac0d67c695fa1868c7534 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -663,7 +663,7 @@ public abstract class PlayerList { diff --git a/patches/server/0775-Make-water-animal-spawn-height-configurable.patch b/patches/server/0774-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0775-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0774-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0776-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 98% rename from patches/server/0776-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index e7ac49dc61..3f77d068b2 100644 --- a/patches/server/0776-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -18,7 +18,7 @@ index 24c88555ea85dd2a0656e1f67a4828a5137157b8..cbbb0ff40488c430d15c2ed054d1b288 biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9f172ccae28779ae28eeeceb4305298b9ceed44a..8be3aeab748b57a73522f6124f8e3aacf1f2ee0e 100644 +index c997788550f03e3441fc879e281eb54f64a44f01..aa460a1c8506b6c499d45f7ee7371ebd540ec7dd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1217,7 +1217,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0777-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0777-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0778-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0778-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0779-Multiple-Entries-with-Scoreboards.patch b/patches/server/0778-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0779-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0778-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0780-Reset-placed-block-on-exception.patch b/patches/server/0779-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0780-Reset-placed-block-on-exception.patch rename to patches/server/0779-Reset-placed-block-on-exception.patch diff --git a/patches/server/0781-Add-configurable-height-for-slime-spawn.patch b/patches/server/0780-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0781-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0780-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0782-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 94% rename from patches/server/0782-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch index a070e8db29..f2c95ba6c0 100644 --- a/patches/server/0782-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch +++ b/patches/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 5df657555439e07d5fb67db8c82246c15676850d..f45b616c4f418298c67903c141c52172b6dd51e0 100644 +index cd4e76fe5b79c7d9e615b4886a568c74db757436..3fcd7bfdb8945b276c94a263e9da6b85ce470366 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -371,7 +371,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0783-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0782-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0783-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0782-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0784-Kick-on-main-for-illegal-chat.patch b/patches/server/0783-Kick-on-main-for-illegal-chat.patch similarity index 90% rename from patches/server/0784-Kick-on-main-for-illegal-chat.patch rename to patches/server/0783-Kick-on-main-for-illegal-chat.patch index fe9d72909f..c71bdee809 100644 --- a/patches/server/0784-Kick-on-main-for-illegal-chat.patch +++ b/patches/server/0783-Kick-on-main-for-illegal-chat.patch @@ -7,10 +7,10 @@ Makes the PlayerKickEvent fire on the main thread for illegal characters or chat out-of-order errors. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e18e2ef7846a49e24411adf571b25d37e068c3fe..c11e1803ba16a6c380bb0a23408a04d724d92798 100644 +index 302582a20700fbea302886115143bd25099e0d51..f0c93d67486d891cda90beb23bb6241d4c55ff1c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2160,7 +2160,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2161,7 +2161,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // CraftBukkit end if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) { @@ -20,7 +20,7 @@ index e18e2ef7846a49e24411adf571b25d37e068c3fe..c11e1803ba16a6c380bb0a23408a04d7 } else { Optional optional = this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages()); -@@ -2194,7 +2196,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2195,7 +2197,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleChatCommand(ServerboundChatCommandPacket packet) { if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) { @@ -30,7 +30,7 @@ index e18e2ef7846a49e24411adf571b25d37e068c3fe..c11e1803ba16a6c380bb0a23408a04d7 } else { Optional optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages()); -@@ -2274,7 +2278,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2275,7 +2279,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private Optional tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) { if (!this.updateChatOrder(timestamp)) { ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message); diff --git a/patches/server/0785-Multi-Block-Change-API-Implementation.patch b/patches/server/0784-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0785-Multi-Block-Change-API-Implementation.patch rename to patches/server/0784-Multi-Block-Change-API-Implementation.patch index 3be6433cec..7b8adbe55d 100644 --- a/patches/server/0785-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0784-Multi-Block-Change-API-Implementation.patch @@ -25,7 +25,7 @@ index c96e75456c2f8564d3bc75993cc6e03ba605597d..7c6a6693760638a07b7c7c330aaeffd9 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 de5bd1107f21c8319178c2287a4a01091b4966b0..93a7d7a3b65c85b639bfa7a419ef8ea840b1d92f 100644 +index d044420955a2a8e19337771ce155777a462c00fe..d6a77a8b459c4b753edf7b0ec955d76861a747ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -948,6 +948,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0786-Fix-NotePlayEvent.patch b/patches/server/0785-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0786-Fix-NotePlayEvent.patch rename to patches/server/0785-Fix-NotePlayEvent.patch diff --git a/patches/server/0787-Freeze-Tick-Lock-API.patch b/patches/server/0786-Freeze-Tick-Lock-API.patch similarity index 95% rename from patches/server/0787-Freeze-Tick-Lock-API.patch rename to patches/server/0786-Freeze-Tick-Lock-API.patch index 7c52e11e44..f21a43eb14 100644 --- a/patches/server/0787-Freeze-Tick-Lock-API.patch +++ b/patches/server/0786-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bd8e756bf1e74cdc75cc12d2368a6fe702a759ad..25610f1100d64f542506cc6b3d4469a810254dc7 100644 +index 374ba7c9a088bc56ec1da96902aab3c81889c64d..dccac696c29a340c5a60fc07aaab7f0f1506b039 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -46,7 +46,7 @@ index bd8e756bf1e74cdc75cc12d2368a6fe702a759ad..25610f1100d64f542506cc6b3d4469a8 } 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 15c00d3dc8cab6968703d0420600aa77b2ffbec5..7fed29460309e1f35ee0207b4c07990201807bd1 100644 +index b167d83abee37d64f8ef5865b9407bf1d2237ea1..b30e52730a7dec78e425365975ba57aa4f371cfd 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3375,7 +3375,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0788-Dolphin-API.patch b/patches/server/0787-Dolphin-API.patch similarity index 100% rename from patches/server/0788-Dolphin-API.patch rename to patches/server/0787-Dolphin-API.patch diff --git a/patches/server/0789-More-PotionEffectType-API.patch b/patches/server/0788-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0789-More-PotionEffectType-API.patch rename to patches/server/0788-More-PotionEffectType-API.patch diff --git a/patches/server/0790-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0790-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0791-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 98% rename from patches/server/0791-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch index 8f25080838..147d81e2ef 100644 --- a/patches/server/0791-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 39c0300d84e44d499b26ea365fc2e038fda58196..aeb0b205a710dc6c638c512f7b5f111aefdea399 100644 +index aa460a1c8506b6c499d45f7ee7371ebd540ec7dd..b3de0224b6837022c4f010f84cf51dc20742764f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1999,6 +1999,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0792-Add-missing-structure-set-seed-configs.patch b/patches/server/0791-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0792-Add-missing-structure-set-seed-configs.patch rename to patches/server/0791-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0793-Implement-regenerateChunk.patch b/patches/server/0792-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0793-Implement-regenerateChunk.patch rename to patches/server/0792-Implement-regenerateChunk.patch diff --git a/patches/server/0794-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0794-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0795-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 91% rename from patches/server/0795-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 9eb1ffdad0..a369e4f3b2 100644 --- a/patches/server/0795-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index aeb0b205a710dc6c638c512f7b5f111aefdea399..0f45a37053a1de4ac131d74382ff6e431f3a40b7 100644 +index b3de0224b6837022c4f010f84cf51dc20742764f..d55f66b98cc3fc8c8d7beff2f83a3f57cc5d7ca0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2173,6 +2173,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0796-Add-GameEvent-tags.patch b/patches/server/0795-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0796-Add-GameEvent-tags.patch rename to patches/server/0795-Add-GameEvent-tags.patch index 43aba9bc64..3507744f3c 100644 --- a/patches/server/0796-Add-GameEvent-tags.patch +++ b/patches/server/0795-Add-GameEvent-tags.patch @@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0f45a37053a1de4ac131d74382ff6e431f3a40b7..70cbdf557b81f9e7e5d744c31ea6972f96de55a3 100644 +index d55f66b98cc3fc8c8d7beff2f83a3f57cc5d7ca0..a4b537774069dc5b3272e1fc06292d7b3144ff5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2583,6 +2583,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0797-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0797-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0798-Furnace-RecipesUsed-API.patch b/patches/server/0797-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0798-Furnace-RecipesUsed-API.patch rename to patches/server/0797-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0799-Configurable-sculk-sensor-listener-range.patch b/patches/server/0798-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0799-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0798-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0800-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0799-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0800-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0799-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0801-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0801-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0802-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0801-Put-world-into-worldlist-before-initing-the-world.patch similarity index 95% rename from patches/server/0802-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0801-Put-world-into-worldlist-before-initing-the-world.patch index 9a651caca0..0caa8a0ca2 100644 --- a/patches/server/0802-Put-world-into-worldlist-before-initing-the-world.patch +++ b/patches/server/0801-Put-world-into-worldlist-before-initing-the-world.patch @@ -23,7 +23,7 @@ index 23fce58a5909c5b01a5f0ef6912f90858cd3302c..a30c61e176501d1cbd2e330f85d5d258 if (worlddata.getCustomBossEvents() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4e8c8d5c40f50899517de585696e5a27ce69de1d..dc460b30c46e33fb0303d5f18d2f80a93a2ca916 100644 +index a4b537774069dc5b3272e1fc06292d7b3144ff5b..2e88728e57ed95c458d5cd5071a245c280d4952e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1246,10 +1246,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0803-Fix-Entity-Position-Desync.patch b/patches/server/0802-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0803-Fix-Entity-Position-Desync.patch rename to patches/server/0802-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0804-Custom-Potion-Mixes.patch b/patches/server/0803-Custom-Potion-Mixes.patch similarity index 99% rename from patches/server/0804-Custom-Potion-Mixes.patch rename to patches/server/0803-Custom-Potion-Mixes.patch index ef275d08fc..35582de9aa 100644 --- a/patches/server/0804-Custom-Potion-Mixes.patch +++ b/patches/server/0803-Custom-Potion-Mixes.patch @@ -164,7 +164,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dc460b30c46e33fb0303d5f18d2f80a93a2ca916..538cee6c80a405613b27b11ee7db2567ceb60400 100644 +index 2e88728e57ed95c458d5cd5071a245c280d4952e..339458bea9298de78f6a3c88426dbcd1b9a67cce 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -294,6 +294,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0805-Force-close-world-loading-screen.patch b/patches/server/0804-Force-close-world-loading-screen.patch similarity index 95% rename from patches/server/0805-Force-close-world-loading-screen.patch rename to patches/server/0804-Force-close-world-loading-screen.patch index ec3cb9486c..a11739b8e5 100644 --- a/patches/server/0805-Force-close-world-loading-screen.patch +++ b/patches/server/0804-Force-close-world-loading-screen.patch @@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to be loaded to close the loading screen, so we just send an empty one. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7b3b5a9bd7bfdec08998f75026fe8d3b8a2a9a42..024b395f7f0cb68dda32f814fc7eef2a07b57eba 100644 +index 4206caa7660611dfbeaac0d67c695fa1868c7534..39858280ef089b503f154b972da32cb2c53e22d2 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -386,6 +386,16 @@ public abstract class PlayerList { diff --git a/patches/server/0806-Fix-falling-block-spawn-methods.patch b/patches/server/0805-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0806-Fix-falling-block-spawn-methods.patch rename to patches/server/0805-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0807-Expose-furnace-minecart-push-values.patch b/patches/server/0806-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0807-Expose-furnace-minecart-push-values.patch rename to patches/server/0806-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0808-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0808-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0809-More-Projectile-API.patch b/patches/server/0808-More-Projectile-API.patch similarity index 99% rename from patches/server/0809-More-Projectile-API.patch rename to patches/server/0808-More-Projectile-API.patch index 3c3d3a8ee9..dc8519b449 100644 --- a/patches/server/0809-More-Projectile-API.patch +++ b/patches/server/0808-More-Projectile-API.patch @@ -357,7 +357,7 @@ index 832981b07ef5c633ef00a382f56798ee87eec0df..faf071201b7c1414225a33fe9641eac9 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index f072f5ee75890650957b1c2ca27adc1a84c2bfa1..d95d37d9dedbd9f74311b47826a74b16ba6ce3e9 100644 +index 16dd2e9951cf34af0c5bd4891d013423b9fad8b9..8147b45892015be602fe14adafd84f84c9685516 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -278,12 +278,20 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0810-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0810-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0811-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 93% rename from patches/server/0811-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch index c1e1ca2e07..dcd70509a8 100644 --- a/patches/server/0811-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/server/0810-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 c11e1803ba16a6c380bb0a23408a04d724d92798..0fc619570ea1280da6f80269abdbd59704a6f9e0 100644 +index f0c93d67486d891cda90beb23bb6241d4c55ff1c..e978a9a29513e5f7fb667f9f02f589605df02ac2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -575,6 +575,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0812-Implement-getComputedBiome-API.patch b/patches/server/0811-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0812-Implement-getComputedBiome-API.patch rename to patches/server/0811-Implement-getComputedBiome-API.patch diff --git a/patches/server/0813-Make-some-itemstacks-nonnull.patch b/patches/server/0812-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0813-Make-some-itemstacks-nonnull.patch rename to patches/server/0812-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0814-Implement-enchantWithLevels-API.patch b/patches/server/0813-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0814-Implement-enchantWithLevels-API.patch rename to patches/server/0813-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0815-Fix-saving-in-unloadWorld.patch b/patches/server/0814-Fix-saving-in-unloadWorld.patch similarity index 90% rename from patches/server/0815-Fix-saving-in-unloadWorld.patch rename to patches/server/0814-Fix-saving-in-unloadWorld.patch index d59619cbfe..d45d93dee3 100644 --- a/patches/server/0815-Fix-saving-in-unloadWorld.patch +++ b/patches/server/0814-Fix-saving-in-unloadWorld.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bee8855e09df7230cc5ce33a8cb8ed05f0af07f3..733157fd438c31b5bd86fea1454386b66d927852 100644 +index 339458bea9298de78f6a3c88426dbcd1b9a67cce..24d4150240c28741a25bdfe1fd7f3a423763bd61 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1294,7 +1294,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0816-Buffer-OOB-setBlock-calls.patch b/patches/server/0815-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0816-Buffer-OOB-setBlock-calls.patch rename to patches/server/0815-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0817-Add-TameableDeathMessageEvent.patch b/patches/server/0816-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0817-Add-TameableDeathMessageEvent.patch rename to patches/server/0816-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0818-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0818-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0819-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0819-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0820-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 92% rename from patches/server/0820-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch index 69d0d68f62..60bbe62d85 100644 --- a/patches/server/0820-Ensure-entity-passenger-world-matches-ridden-entity.patch +++ b/patches/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity Bad plugins doing this would cause some obvious problems... diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 25610f1100d64f542506cc6b3d4469a810254dc7..35a246c1b167b356e293dd785c05f59a3ebcf4d8 100644 +index dccac696c29a340c5a60fc07aaab7f0f1506b039..e052694ca221508f28cbfbb93a6ec974d9ca65d8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2723,6 +2723,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0821-Guard-against-invalid-entity-positions.patch b/patches/server/0820-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0821-Guard-against-invalid-entity-positions.patch rename to patches/server/0820-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0822-cache-resource-keys.patch b/patches/server/0821-cache-resource-keys.patch similarity index 100% rename from patches/server/0822-cache-resource-keys.patch rename to patches/server/0821-cache-resource-keys.patch diff --git a/patches/server/0823-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0823-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0824-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0824-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0825-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0825-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0826-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0825-Prevent-tile-entity-copies-loading-chunks.patch similarity index 89% rename from patches/server/0826-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0825-Prevent-tile-entity-copies-loading-chunks.patch index f548228758..665a931a50 100644 --- a/patches/server/0826-Prevent-tile-entity-copies-loading-chunks.patch +++ b/patches/server/0825-Prevent-tile-entity-copies-loading-chunks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity copies loading chunks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0fc619570ea1280da6f80269abdbd59704a6f9e0..94dbe4bd2c81d7c43d6eb0ed4e912ecd222a3b63 100644 +index e978a9a29513e5f7fb667f9f02f589605df02ac2..cb1b428ce97aa52a6d64603f0b0b1f5fddced9f3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3300,7 +3300,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3301,7 +3301,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound); if (this.player.level.isLoaded(blockposition)) { diff --git a/patches/server/0827-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 92% rename from patches/server/0827-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch index 0b170fb2f3..b4c2f704fa 100644 --- a/patches/server/0827-Use-username-instead-of-display-name-in-PlayerList-g.patch +++ b/patches/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 024b395f7f0cb68dda32f814fc7eef2a07b57eba..377093456d4e701a6fcfb9ed053acbfdb6247cf4 100644 +index 39858280ef089b503f154b972da32cb2c53e22d2..63ff18599d820bd168735879f0443c90ce1b5c52 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1420,7 +1420,7 @@ public abstract class PlayerList { diff --git a/patches/server/0828-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0828-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0829-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 98% rename from patches/server/0829-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch index 21f7badd50..f9453a41cf 100644 --- a/patches/server/0829-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -18,10 +18,10 @@ index 5b46cabf4f2e2a1f7feaad378dd98d64aeef8671..51b3db0b6c2cede95b584268e035c0fb if (dedicatedserverproperties.enableQuery) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 94dbe4bd2c81d7c43d6eb0ed4e912ecd222a3b63..aaa4e96f20f11b6e01a1d70f8c80d45cc7b1669a 100644 +index cb1b428ce97aa52a6d64603f0b0b1f5fddced9f3..8d9a3c7a66895966aade2626c828f8cbcdd32380 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2891,7 +2891,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2892,7 +2892,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.player = this.server.getPlayerList().respawn(this.player, false); if (this.server.isHardcore()) { this.player.setGameMode(GameType.SPECTATOR, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.HARDCORE_DEATH, null); // Paper diff --git a/patches/server/0830-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0830-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0831-WorldCreator-keepSpawnLoaded.patch b/patches/server/0830-WorldCreator-keepSpawnLoaded.patch similarity index 91% rename from patches/server/0831-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0830-WorldCreator-keepSpawnLoaded.patch index 14ecdb4813..82c56e402c 100644 --- a/patches/server/0831-WorldCreator-keepSpawnLoaded.patch +++ b/patches/server/0830-WorldCreator-keepSpawnLoaded.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 733157fd438c31b5bd86fea1454386b66d927852..924a2d2d0737bcaf0ebe701557124d4a434eac82 100644 +index 24d4150240c28741a25bdfe1fd7f3a423763bd61..0d2c4bc4674fb2ad2a024994c07d62d16bdf6662 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1253,6 +1253,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0832-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0832-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0833-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 97% rename from patches/server/0833-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch index fac03ea413..fe4c9bae8c 100644 --- a/patches/server/0833-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch +++ b/patches/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch @@ -40,7 +40,7 @@ index 5461e6ff769be93054b3d8369a7aa286d1244875..161a810a8c4bd4c916c54df49c44c504 return true; // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java -index e3704080dc44ea429ecdc477e2ac57692d7833fc..7867333757c300cd52110c2cf5d0a5bb19f9505d 100644 +index bd58ae8bb1fcafa2c618f2b0b7825731188a3d65..ca6cf92b96d68ba8b34e90edda2a93e11214c91b 100644 --- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java @@ -88,7 +88,7 @@ public class BeehiveBlock extends BaseEntityBlock { diff --git a/patches/server/0834-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0834-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0835-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0835-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0836-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0836-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0837-Add-PlayerStopUsingItemEvent.patch b/patches/server/0836-Add-PlayerStopUsingItemEvent.patch similarity index 91% rename from patches/server/0837-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0836-Add-PlayerStopUsingItemEvent.patch index 4e658c7756..2b87b8fe29 100644 --- a/patches/server/0837-Add-PlayerStopUsingItemEvent.patch +++ b/patches/server/0836-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 7fed29460309e1f35ee0207b4c07990201807bd1..4e27d0e537a0d813ab81d3bc6524ad038047a0a1 100644 +index b30e52730a7dec78e425365975ba57aa4f371cfd..34ef66a6f0cfb2bb1435c7342b6261d31dd011ef 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3934,6 +3934,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0838-FallingBlock-auto-expire-setting.patch b/patches/server/0837-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0838-FallingBlock-auto-expire-setting.patch rename to patches/server/0837-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0839-Don-t-tick-markers.patch b/patches/server/0838-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0839-Don-t-tick-markers.patch rename to patches/server/0838-Don-t-tick-markers.patch diff --git a/patches/server/0840-Do-not-accept-invalid-client-settings.patch b/patches/server/0839-Do-not-accept-invalid-client-settings.patch similarity index 88% rename from patches/server/0840-Do-not-accept-invalid-client-settings.patch rename to patches/server/0839-Do-not-accept-invalid-client-settings.patch index 06571bd519..be30e69031 100644 --- a/patches/server/0840-Do-not-accept-invalid-client-settings.patch +++ b/patches/server/0839-Do-not-accept-invalid-client-settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Do not accept invalid client settings diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index aaa4e96f20f11b6e01a1d70f8c80d45cc7b1669a..31f22cee3713eeca03f165c3cc5089563089076a 100644 +index 8d9a3c7a66895966aade2626c828f8cbcdd32380..f295110637682c2b4064682e456264e017b512e3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3479,6 +3479,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3480,6 +3480,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleClientInformation(ServerboundClientInformationPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); diff --git a/patches/server/0841-Add-support-for-Proxy-Protocol.patch b/patches/server/0840-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0841-Add-support-for-Proxy-Protocol.patch rename to patches/server/0840-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0842-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0842-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0843-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0843-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0844-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0843-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0844-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0843-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0846-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0844-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0846-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0844-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0847-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0846-Throw-exception-on-world-create-while-being-ticked.patch similarity index 97% rename from patches/server/0847-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0846-Throw-exception-on-world-create-while-being-ticked.patch index 70dcc81c39..3440e68403 100644 --- a/patches/server/0847-Throw-exception-on-world-create-while-being-ticked.patch +++ b/patches/server/0846-Throw-exception-on-world-create-while-being-ticked.patch @@ -45,7 +45,7 @@ index 3e59620c84b3aa93d8ce41b0e9901a1621bb48df..682005e4b19ba3959d4e3a66475487da this.profiler.popPush("connection"); MinecraftTimings.connectionTimer.startTiming(); // Spigot diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a5df4d05804782c87272ade6fe727e92ffa8ee09..3f3437d3dcba2cd647577c726e831e723443dc2f 100644 +index 0d2c4bc4674fb2ad2a024994c07d62d16bdf6662..fc5e363dec88d5a45d9cb788779b9cb5980b5ff5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -845,6 +845,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0848-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0847-Add-Alternate-Current-redstone-implementation.patch similarity index 99% rename from patches/server/0848-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0847-Add-Alternate-Current-redstone-implementation.patch index 3780b19c03..5748fc24d2 100644 --- a/patches/server/0848-Add-Alternate-Current-redstone-implementation.patch +++ b/patches/server/0847-Add-Alternate-Current-redstone-implementation.patch @@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7ae780c4a38eb088f876e5bd03a0dba5836787fb..5c96d98ccb9b01219de3439aec1e459752dbac6c 100644 +index 5180516d53030602c4516248703144b3f4047614..08d3d6d5f21326f1b94f2990de702b638e4759cc 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -219,6 +219,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0849-Dont-resent-entity-on-art-update.patch b/patches/server/0848-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0849-Dont-resent-entity-on-art-update.patch rename to patches/server/0848-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0850-Add-WardenAngerChangeEvent.patch b/patches/server/0849-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0850-Add-WardenAngerChangeEvent.patch rename to patches/server/0849-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0851-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0850-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0851-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0850-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0852-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0851-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0852-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0851-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0853-Nameable-Banner-API.patch b/patches/server/0852-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0853-Nameable-Banner-API.patch rename to patches/server/0852-Nameable-Banner-API.patch diff --git a/patches/server/0854-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0853-Don-t-broadcast-messages-to-command-blocks.patch similarity index 95% rename from patches/server/0854-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0853-Don-t-broadcast-messages-to-command-blocks.patch index f104d75f94..03d56dfed6 100644 --- a/patches/server/0854-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0853-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,7 +20,7 @@ index 7c7e5f3c0f9cd1f16192a8fc8163da9b2d9519d5..888936385196a178ab8b730fd5e4fff4 Date date = new Date(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1ecb719bc8bdf9611022307a55965868243d26ee..72f4b2adb2601e9869fe972cff5da4d6934f5325 100644 +index fc5e363dec88d5a45d9cb788779b9cb5980b5ff5..c37cb8a3d7f1d463db8d3719e6a4e00446b32e00 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1772,7 +1772,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0855-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0854-Prevent-empty-items-from-being-added-to-world.patch similarity index 96% rename from patches/server/0855-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0854-Prevent-empty-items-from-being-added-to-world.patch index 6cfd081b56..728b81e026 100644 --- a/patches/server/0855-Prevent-empty-items-from-being-added-to-world.patch +++ b/patches/server/0854-Prevent-empty-items-from-being-added-to-world.patch @@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca Just simply prevent them from being added to the world instead. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5c96d98ccb9b01219de3439aec1e459752dbac6c..0e02012f90efd729a9e4122f23a3d724ab7ebfbf 100644 +index 08d3d6d5f21326f1b94f2990de702b638e4759cc..131a7ff0847272b2f9fecf62d0d28ca014689f5b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1503,6 +1503,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0856-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0856-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0857-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 90% rename from patches/server/0857-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch index c23abad7e2..d86bf587e8 100644 --- a/patches/server/0857-Don-t-print-component-in-resource-pack-rejection-mes.patch +++ b/patches/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch @@ -5,10 +5,10 @@ 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 31f22cee3713eeca03f165c3cc5089563089076a..21edf73383cdc7180f3b19d178af0be8f922a0d8 100644 +index f295110637682c2b4064682e456264e017b512e3..94d8c0f3c94d257b7942dd2985e9b49117afba72 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2031,7 +2031,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2032,7 +2032,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic public void handleResourcePackResponse(ServerboundResourcePackPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) { diff --git a/patches/server/0858-Add-Player-getFishHook.patch b/patches/server/0857-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0858-Add-Player-getFishHook.patch rename to patches/server/0857-Add-Player-getFishHook.patch diff --git a/patches/server/0859-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0859-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0860-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 97% rename from patches/server/0860-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch index 839cd2c3a8..9b3b037834 100644 --- a/patches/server/0860-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7e10c68fba3c833d414ffc80426615eef85b2c47..a3b17621ae3400e52a3f3dd3f782992d5af5fdae 100644 +index 70fe8f109d86265200b2943e504610a2fb386420..496ba4f6a6a9e921bb7b311d96ff7cd7962eee11 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2557,6 +2557,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0861-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 90% rename from patches/server/0861-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch index a50aca22a0..a78200f261 100644 --- a/patches/server/0861-Add-some-minimal-debug-information-to-chat-packet-er.patch +++ b/patches/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors TODO: potentially add some kick leeway diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 21edf73383cdc7180f3b19d178af0be8f922a0d8..d08b81e4fb082216a83334d65118825ad1d2e988 100644 +index 94d8c0f3c94d257b7942dd2985e9b49117afba72..9fa723df14d62e6ed8be9df1d0a271d27bfb9347 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2283,7 +2283,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2284,7 +2284,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic private Optional tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) { if (!this.updateChatOrder(timestamp)) { diff --git a/patches/server/0862-Fix-Bee-flower-NPE.patch b/patches/server/0861-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0862-Fix-Bee-flower-NPE.patch rename to patches/server/0861-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0863-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 87% rename from patches/server/0863-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 8fcab53def..a247cb9f2f 100644 --- a/patches/server/0863-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d08b81e4fb082216a83334d65118825ad1d2e988..3c0378e8b0f1cb56331b9e89db8f530f3a0dcf64 100644 +index 9fa723df14d62e6ed8be9df1d0a271d27bfb9347..4e318ecd2e1726127b42cb086c5b987ff0234e51 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2530,7 +2530,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2531,7 +2531,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Spigot end // this.chatSpamTickCount += 20; diff --git a/patches/server/0864-More-Teleport-API.patch b/patches/server/0863-More-Teleport-API.patch similarity index 98% rename from patches/server/0864-More-Teleport-API.patch rename to patches/server/0863-More-Teleport-API.patch index 099c50008c..cdf7fd7973 100644 --- a/patches/server/0864-More-Teleport-API.patch +++ b/patches/server/0863-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 3c0378e8b0f1cb56331b9e89db8f530f3a0dcf64..bcbea0fa4fc277f08d90eea5ea4411516362e21e 100644 +index 4e318ecd2e1726127b42cb086c5b987ff0234e51..ae6ced55937642d26bb7bb772b560b34896ea303 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1708,11 +1708,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -74,7 +74,7 @@ index 7df1eebce5b62214943e55314e9ec98f056fa330..2aee8aacd50431c18ff28af678348ec2 // 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 93a7d7a3b65c85b639bfa7a419ef8ea840b1d92f..1253b9d39582baa9f3be36b2f9f134032a7e91b3 100644 +index d6a77a8b459c4b753edf7b0ec955d76861a747ed..14d09da578a8928288eb81dcbdd4ecd508cf2dfe 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1261,13 +1261,100 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0865-Add-EntityPortalReadyEvent.patch b/patches/server/0864-Add-EntityPortalReadyEvent.patch similarity index 94% rename from patches/server/0865-Add-EntityPortalReadyEvent.patch rename to patches/server/0864-Add-EntityPortalReadyEvent.patch index a48a560408..76eb1492d0 100644 --- a/patches/server/0865-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0864-Add-EntityPortalReadyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a3b17621ae3400e52a3f3dd3f782992d5af5fdae..3a609fb4cd770d3945bd4ca7d7f0cca1a86d3d64 100644 +index 496ba4f6a6a9e921bb7b311d96ff7cd7962eee11..32a74fa1afeef72c9014ded08ffb29eba7be1a1b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2912,6 +2912,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0866-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0865-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0866-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0865-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0867-Send-block-entities-after-destroy-prediction.patch b/patches/server/0866-Send-block-entities-after-destroy-prediction.patch similarity index 97% rename from patches/server/0867-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0866-Send-block-entities-after-destroy-prediction.patch index 192dcd2ac9..181592673f 100644 --- a/patches/server/0867-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0866-Send-block-entities-after-destroy-prediction.patch @@ -57,10 +57,10 @@ index 161a810a8c4bd4c916c54df49c44c504130cb28e..45b48da09eafa8482836e49768426069 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bcbea0fa4fc277f08d90eea5ea4411516362e21e..4aa0b52f8256efb3d63c774d0025d3b85c5ab955 100644 +index ae6ced55937642d26bb7bb772b560b34896ea303..d8272a0b290508d581cfe20eb263bd441b4f544b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1853,8 +1853,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1854,8 +1854,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } // Paper end - Don't allow digging in unloaded chunks diff --git a/patches/server/0868-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0868-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0869-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0869-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch index 0eb1dde73f..22cda1849e 100644 --- a/patches/server/0869-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0868-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 1253b9d39582baa9f3be36b2f9f134032a7e91b3..63da84519af19680d93c5d845d337ec784f2dc9e 100644 +index 14d09da578a8928288eb81dcbdd4ecd508cf2dfe..061df56e4334b1821605b7e6badea4a760fdb512 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -670,6 +670,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0870-Add-missing-BlockFadeEvents.patch b/patches/server/0869-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0870-Add-missing-BlockFadeEvents.patch rename to patches/server/0869-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0871-Collision-API.patch b/patches/server/0870-Collision-API.patch similarity index 100% rename from patches/server/0871-Collision-API.patch rename to patches/server/0870-Collision-API.patch diff --git a/patches/server/0872-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0872-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0873-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0872-Remove-invalid-signature-login-stacktrace.patch similarity index 88% rename from patches/server/0873-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0872-Remove-invalid-signature-login-stacktrace.patch index 8e8b6201e9..81e06b99f5 100644 --- a/patches/server/0873-Remove-invalid-signature-login-stacktrace.patch +++ b/patches/server/0872-Remove-invalid-signature-login-stacktrace.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove invalid signature login stacktrace diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ca8d14ec52ec53654be5afa9a2eb67e83b18ccba..95246bdf8c736a870618263c4f8316b2d3d91ba2 100644 +index d8272a0b290508d581cfe20eb263bd441b4f544b..f86b9e5e34aa8716a9f560c2f271936175f641b3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3609,7 +3609,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3610,7 +3610,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator, Duration.ZERO)); } catch (ProfilePublicKey.ValidationException profilepublickey_b) { diff --git a/patches/server/0875-Block-Ticking-API.patch b/patches/server/0873-Block-Ticking-API.patch similarity index 100% rename from patches/server/0875-Block-Ticking-API.patch rename to patches/server/0873-Block-Ticking-API.patch diff --git a/patches/server/0876-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0874-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from patches/server/0876-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0874-Add-Velocity-IP-Forwarding-Support.patch index 885413acfd..4a8092f783 100644 --- a/patches/server/0876-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0874-Add-Velocity-IP-Forwarding-Support.patch @@ -213,7 +213,7 @@ index 3fcd7bfdb8945b276c94a263e9da6b85ce470366..3431b1132e55c53cda7cf47f021f2306 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2a9b967e40909ccd4727c1ca81b57b6ca9ce4f05..f9a9d2bb7b6d1bf4a0931438de4d8c7ee0757479 100644 +index c37cb8a3d7f1d463db8d3719e6a4e00446b32e00..0ba8446065def1b120fd73241de5bc14d60d3b82 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -774,7 +774,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0874-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0874-Add-async-catcher-to-PlayerConnection-internalTelepo.patch deleted file mode 100644 index 813fb7a6cd..0000000000 --- a/patches/server/0874-Add-async-catcher-to-PlayerConnection-internalTelepo.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Spottedleaf -Date: Wed, 3 Aug 2022 12:57:36 -0700 -Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 95246bdf8c736a870618263c4f8316b2d3d91ba2..e5caa9cbd1444698409bb6c4e46ee4086a37ebf5 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1736,6 +1736,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - } - - public void internalTeleport(double d0, double d1, double d2, float f, float f1, Set set) { // Paper -+ org.spigotmc.AsyncCatcher.catchOp("teleport"); // Paper - // Paper start - if (player.isRemoved()) { - LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName()); diff --git a/patches/server/0877-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 92% rename from patches/server/0877-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch index 5fcce3bb49..2e38ad24c3 100644 --- a/patches/server/0877-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch +++ b/patches/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 6a30389c1d498843ca8cc01bfc50dc5656d7d2e4..d087696b2712683eb8e7875ee43d815efa5aee60 100644 +index 3431b1132e55c53cda7cf47f021f23068b63322d..2ff578e4a953ffcf5176815ba8e3f06f73499989 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -49,7 +49,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0878-Add-NamespacedKey-biome-methods.patch b/patches/server/0876-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0878-Add-NamespacedKey-biome-methods.patch rename to patches/server/0876-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0879-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0877-Fix-plugin-loggers-on-server-shutdown.patch similarity index 96% rename from patches/server/0879-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0877-Fix-plugin-loggers-on-server-shutdown.patch index f1df439fb2..9a7c82b944 100644 --- a/patches/server/0879-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0877-Fix-plugin-loggers-on-server-shutdown.patch @@ -49,7 +49,7 @@ index 682005e4b19ba3959d4e3a66475487daf534a003..fbc06f45926e9073c95c97423f92a213 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 75a37fe0b97311ee64fb0ea87b9574879d67e8d3..4966a1e3dd35357a8ea6a7d2944c84c9c3e9058e 100644 +index f332af9c9e16c3851c5a14dad9ad182dd731ed87..755c223ab2a046285eb9916b6195093714f4c5ba 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/server/0880-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch similarity index 100% rename from patches/server/0880-Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch diff --git a/patches/server/0881-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0879-Stop-large-look-changes-from-crashing-the-server.patch similarity index 96% rename from patches/server/0881-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0879-Stop-large-look-changes-from-crashing-the-server.patch index 0396426cae..c1d9c8b1b2 100644 --- a/patches/server/0881-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/server/0879-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 6b1c5b51693b8ae9ece498d4711b4493d0f5543a..80970c877b9e729fc88451745a490f0b80a7c1b6 100644 +index 34ef66a6f0cfb2bb1435c7342b6261d31dd011ef..f1dc127a92fe13e92f9af660f98afcdd78f6cbd5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2996,37 +2996,15 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0882-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0882-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0883-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0883-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0884-Missing-eating-regain-reason.patch b/patches/server/0882-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0884-Missing-eating-regain-reason.patch rename to patches/server/0882-Missing-eating-regain-reason.patch diff --git a/patches/server/0885-Missing-effect-cause.patch b/patches/server/0883-Missing-effect-cause.patch similarity index 100% rename from patches/server/0885-Missing-effect-cause.patch rename to patches/server/0883-Missing-effect-cause.patch diff --git a/patches/server/0886-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0884-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0886-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0884-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0887-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 93% rename from patches/server/0887-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch index 598fea5f74..d028d6d5e9 100644 --- a/patches/server/0887-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch +++ b/patches/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index cbb6b437358823cd52518682f32dd597c9aeb85a..b1b13bbcc01edae7b86e2ee78ebc88e686b482c2 100644 +index 205101e301bb4ea552459fe4e1f028f252136720..5f20251a7d9c3cfa48775d825e557b75930d7923 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -499,8 +499,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -500,8 +500,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } @Override @@ -25,7 +25,7 @@ index cbb6b437358823cd52518682f32dd597c9aeb85a..b1b13bbcc01edae7b86e2ee78ebc88e6 Preconditions.checkState(!this.getHandle().generation, "Cannot launch projectile during world generation"); net.minecraft.world.level.Level world = ((CraftWorld) getWorld()).getHandle(); -@@ -583,6 +590,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -584,6 +591,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { if (velocity != null) { ((T) launch.getBukkitEntity()).setVelocity(velocity); } diff --git a/patches/server/0888-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0886-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0888-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0886-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0889-Configurable-chat-thread-limit.patch b/patches/server/0887-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0889-Configurable-chat-thread-limit.patch rename to patches/server/0887-Configurable-chat-thread-limit.patch diff --git a/patches/server/0890-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0890-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0891-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0889-Set-position-before-player-sending-on-dimension-chan.patch similarity index 100% rename from patches/server/0891-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/server/0889-Set-position-before-player-sending-on-dimension-chan.patch diff --git a/patches/server/0892-fix-Jigsaw-block-kicking-user.patch b/patches/server/0890-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0892-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0890-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0893-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0893-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0894-Add-getDrops-to-BlockState.patch b/patches/server/0892-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0894-Add-getDrops-to-BlockState.patch rename to patches/server/0892-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0895-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0895-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0896-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0896-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0897-Fix-custom-piglin-loved-items.patch b/patches/server/0895-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0897-Fix-custom-piglin-loved-items.patch rename to patches/server/0895-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0898-EntityPickupItemEvent-fixes.patch b/patches/server/0896-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0898-EntityPickupItemEvent-fixes.patch rename to patches/server/0896-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0899-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0899-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0900-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0898-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0900-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0898-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0901-Elder-Guardian-appearance-API.patch b/patches/server/0899-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0901-Elder-Guardian-appearance-API.patch rename to patches/server/0899-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0902-Allow-changing-bed-s-occupied-property.patch b/patches/server/0900-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0902-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0900-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0903-Add-entity-knockback-API.patch b/patches/server/0901-Add-entity-knockback-API.patch similarity index 85% rename from patches/server/0903-Add-entity-knockback-API.patch rename to patches/server/0901-Add-entity-knockback-API.patch index 8c465ea23d..9accc7491c 100644 --- a/patches/server/0903-Add-entity-knockback-API.patch +++ b/patches/server/0901-Add-entity-knockback-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index b1b13bbcc01edae7b86e2ee78ebc88e686b482c2..1dcae648dd8b5fcd0ccd814ec44d4e071f0439c3 100644 +index 5f20251a7d9c3cfa48775d825e557b75930d7923..f6e5de14a674a2dd7841c1e03f136cc48e2352cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -994,5 +994,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -995,5 +995,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); } diff --git a/patches/server/0904-Detect-headless-JREs.patch b/patches/server/0902-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0904-Detect-headless-JREs.patch rename to patches/server/0902-Detect-headless-JREs.patch diff --git a/patches/server/0905-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0903-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0905-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0903-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0906-optimized-dirt-and-snow-spreading.patch b/patches/server/0904-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0906-optimized-dirt-and-snow-spreading.patch rename to patches/server/0904-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0907-Added-EntityToggleSitEvent.patch b/patches/server/0905-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0907-Added-EntityToggleSitEvent.patch rename to patches/server/0905-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0908-Add-fire-tick-delay-option.patch b/patches/server/0906-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0908-Add-fire-tick-delay-option.patch rename to patches/server/0906-Add-fire-tick-delay-option.patch diff --git a/patches/server/0909-Add-Moving-Piston-API.patch b/patches/server/0907-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0909-Add-Moving-Piston-API.patch rename to patches/server/0907-Add-Moving-Piston-API.patch diff --git a/patches/server/0910-Ignore-impossible-spawn-tick.patch b/patches/server/0908-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0910-Ignore-impossible-spawn-tick.patch rename to patches/server/0908-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0911-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0911-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0912-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0912-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0913-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0913-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0914-Prevent-compass-from-loading-chunks.patch b/patches/server/0912-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0914-Prevent-compass-from-loading-chunks.patch rename to patches/server/0912-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0915-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0913-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0915-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0913-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0916-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0914-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0916-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0914-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0917-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0917-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0918-Add-Player-Warden-Warning-API.patch b/patches/server/0916-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0918-Add-Player-Warden-Warning-API.patch rename to patches/server/0916-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0919-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0917-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0919-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0917-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0920-Add-paper-dumplisteners-command.patch b/patches/server/0918-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0920-Add-paper-dumplisteners-command.patch rename to patches/server/0918-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0921-check-global-player-list-where-appropriate.patch b/patches/server/0919-check-global-player-list-where-appropriate.patch similarity index 98% rename from patches/server/0921-check-global-player-list-where-appropriate.patch rename to patches/server/0919-check-global-player-list-where-appropriate.patch index a798961a60..9cf8b0a7ed 100644 --- a/patches/server/0921-check-global-player-list-where-appropriate.patch +++ b/patches/server/0919-check-global-player-list-where-appropriate.patch @@ -24,7 +24,7 @@ index 066744d37670e0ee4254a34743887416412b0065..309ef1b2181eae609737212a50d037a1 + // 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 80970c877b9e729fc88451745a490f0b80a7c1b6..a7d74f16d82853f40d5641794dc12a8404359c94 100644 +index f1dc127a92fe13e92f9af660f98afcdd78f6cbd5..a7559d76d0ad4b5fe08a071567a195d19d47163b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3571,7 +3571,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0922-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0922-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0923-ItemStack-damage-API.patch b/patches/server/0921-ItemStack-damage-API.patch similarity index 95% rename from patches/server/0923-ItemStack-damage-API.patch rename to patches/server/0921-ItemStack-damage-API.patch index d2b6d9c704..1bab672181 100644 --- a/patches/server/0923-ItemStack-damage-API.patch +++ b/patches/server/0921-ItemStack-damage-API.patch @@ -11,10 +11,10 @@ the logic associated with damaging them public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 1dcae648dd8b5fcd0ccd814ec44d4e071f0439c3..755ada4b9cbec40bd1d0db2b0ba4ece5933d4e8d 100644 +index f6e5de14a674a2dd7841c1e03f136cc48e2352cf..b5d4efe6fc177622fcf03c458c33bf770af87ff2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -995,6 +995,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -996,6 +996,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); } diff --git a/patches/server/0924-Friction-API.patch b/patches/server/0922-Friction-API.patch similarity index 96% rename from patches/server/0924-Friction-API.patch rename to patches/server/0922-Friction-API.patch index 4ddd0807eb..78de584ef6 100644 --- a/patches/server/0924-Friction-API.patch +++ b/patches/server/0922-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 a7d74f16d82853f40d5641794dc12a8404359c94..1f41b48964f168532e9f07a4e708e2afb3791c3e 100644 +index a7559d76d0ad4b5fe08a071567a195d19d47163b..bc108e721cf6a7713449caf821635be736b7a98c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -132,10 +132,10 @@ index e9946edf568db010e4ccb9fe7755709ed7b8310f..a925b5c490e7129b27370aa57b5fad1c public int getHealth() { return item.health; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 755ada4b9cbec40bd1d0db2b0ba4ece5933d4e8d..a77f626f79db9a10367bcd51ae946f93fea6ee69 100644 +index b5d4efe6fc177622fcf03c458c33bf770af87ff2..daf6653f30337ef88bad9decb7d73c45f951b270 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1042,6 +1042,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1043,6 +1043,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { }); } diff --git a/patches/server/0925-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0925-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0926-Fix-player-kick-on-shutdown.patch b/patches/server/0924-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0926-Fix-player-kick-on-shutdown.patch rename to patches/server/0924-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0927-Sync-offhand-slot-in-menus.patch b/patches/server/0925-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0927-Sync-offhand-slot-in-menus.patch rename to patches/server/0925-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0928-Player-Entity-Tracking-Events.patch b/patches/server/0926-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0928-Player-Entity-Tracking-Events.patch rename to patches/server/0926-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0929-Limit-pet-look-distance.patch b/patches/server/0927-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0929-Limit-pet-look-distance.patch rename to patches/server/0927-Limit-pet-look-distance.patch diff --git a/patches/server/0930-Properly-resend-entities.patch b/patches/server/0928-Properly-resend-entities.patch similarity index 98% rename from patches/server/0930-Properly-resend-entities.patch rename to patches/server/0928-Properly-resend-entities.patch index c7c1dfd208..3315074536 100644 --- a/patches/server/0930-Properly-resend-entities.patch +++ b/patches/server/0928-Properly-resend-entities.patch @@ -79,7 +79,7 @@ index f86b9e5e34aa8716a9f560c2f271936175f641b3..04386413177d0fb1338fccabf8af5746 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 377093456d4e701a6fcfb9ed053acbfdb6247cf4..f09fe42ecf1660f1ee1cdaa632d387cc5f736150 100644 +index 63ff18599d820bd168735879f0443c90ce1b5c52..169dd56fd9dbb2439e4773f630ed06ee51354b3a 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -361,7 +361,7 @@ public abstract class PlayerList { diff --git a/patches/server/0931-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0931-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0932-fix-Instruments.patch b/patches/server/0930-fix-Instruments.patch similarity index 97% rename from patches/server/0932-fix-Instruments.patch rename to patches/server/0930-fix-Instruments.patch index e86c82fab7..67a56edde5 100644 --- a/patches/server/0932-fix-Instruments.patch +++ b/patches/server/0930-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 68acf053ff84cc32967de27363cf8fadd557f55b..df977da24611434b29cd00c6d3ae07e479ee228d 100644 +index 5279560ce77822f8aad8930fe916d49a47eb928c..f26655ebc1edfef060fb4d97fa56a42cede9b4ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -772,62 +772,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0933-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0933-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0934-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0932-Fix-MapLike-Codec-missing-key-selector.patch similarity index 100% rename from patches/server/0934-Fix-MapLike-Codec-missing-key-selector.patch rename to patches/server/0932-Fix-MapLike-Codec-missing-key-selector.patch diff --git a/patches/server/0935-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0935-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0936-Improve-logging-and-errors.patch b/patches/server/0934-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0936-Improve-logging-and-errors.patch rename to patches/server/0934-Improve-logging-and-errors.patch diff --git a/patches/server/0937-Add-BlockLockCheckEvent.patch b/patches/server/0935-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0937-Add-BlockLockCheckEvent.patch rename to patches/server/0935-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0938-Add-Sneaking-API-for-Entities.patch b/patches/server/0936-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0938-Add-Sneaking-API-for-Entities.patch rename to patches/server/0936-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0939-Improve-PortalEvents.patch b/patches/server/0937-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0939-Improve-PortalEvents.patch rename to patches/server/0937-Improve-PortalEvents.patch diff --git a/patches/server/0940-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0938-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0940-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0938-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0941-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0939-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0941-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0939-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0942-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0942-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0943-Flying-Fall-Damage.patch b/patches/server/0941-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0943-Flying-Fall-Damage.patch rename to patches/server/0941-Flying-Fall-Damage.patch diff --git a/patches/server/0944-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 98% rename from patches/server/0944-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch index edb84486aa..84802db1d2 100644 --- a/patches/server/0944-Add-exploded-block-state-to-BlockExplodeEvent.patch +++ b/patches/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch @@ -52,7 +52,7 @@ index ff2ea0ae47fb6e083cf7dbb992d59416067b5c7d..59837144c2c0460aca6e8c349eb3d652 cancelled = event.isCancelled(); bukkitBlocks = event.blockList(); diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java -index 002575ac14697572602e3f622b7ed1c93eca04c3..96434f14525a2159f335b94aad95081f488fadf3 100644 +index 7c22fc7a384c61670ec9db0c69178d29eba51f51..33e4d832f00f0f563931bed77722a2b62923e4c0 100644 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java @@ -87,6 +87,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock diff --git a/patches/server/0945-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0945-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0946-config-for-disabling-entity-tag-tags.patch b/patches/server/0944-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0946-config-for-disabling-entity-tag-tags.patch rename to patches/server/0944-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0947-Use-single-player-info-update-packet-on-join.patch b/patches/server/0945-Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/server/0947-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0945-Use-single-player-info-update-packet-on-join.patch index 7798b6aa59..354b1af06c 100644 --- a/patches/server/0947-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0945-Use-single-player-info-update-packet-on-join.patch @@ -18,7 +18,7 @@ index afcdd85d2b10bbd76c589c419feefd87f3ea1825..2d8488b9aa088b6d5f0c7e557b8ad0b2 }); } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f09fe42ecf1660f1ee1cdaa632d387cc5f736150..a1096ea424c0724af93a2dc65512ee71f4a0bf72 100644 +index 169dd56fd9dbb2439e4773f630ed06ee51354b3a..9e7c3f885505ee678ca390aac09a477394b78bb0 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -307,7 +307,7 @@ public abstract class PlayerList { diff --git a/patches/server/0948-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 95% rename from patches/server/0948-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch index 46a3999218..4f235fdee4 100644 --- a/patches/server/0948-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0946-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 1f41b48964f168532e9f07a4e708e2afb3791c3e..e9d3e34520b706627205e0d5b17b25e09f198e7e 100644 +index bc108e721cf6a7713449caf821635be736b7a98c..d13fd686ce449f32d4916a86ee66fcc3df648b80 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1543,7 +1543,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0949-Win-Screen-API.patch b/patches/server/0947-Win-Screen-API.patch similarity index 93% rename from patches/server/0949-Win-Screen-API.patch rename to patches/server/0947-Win-Screen-API.patch index d46c7a1fc9..a17ae351b4 100644 --- a/patches/server/0949-Win-Screen-API.patch +++ b/patches/server/0947-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 cec690035206876ac8bd1ad0b06cb88ec1e178ab..cd28c82f3f8150ca7def1fd6e4cb4a321e53c18e 100644 +index 0d804163de6d332aa1ed60eece6ad4c8c538df85..540b27a1c53bc010a66cd934b524468989c67826 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1231,6 +1231,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0950-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 93% rename from patches/server/0950-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch index 173cdf6f07..e07a332e83 100644 --- a/patches/server/0950-Remove-CraftItemStack-setAmount-null-assignment.patch +++ b/patches/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch @@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create a problem with operations on the vanilla ItemStack. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index d95d37d9dedbd9f74311b47826a74b16ba6ce3e9..f45e4acee69bd95ff2e41feaf44f5414d2e40df0 100644 +index 8147b45892015be602fe14adafd84f84c9685516..0e7a6a5a83b4630f53e6dba1b5b29f67d91c7240 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -146,7 +146,7 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0951-Fix-force-opening-enchantment-tables.patch b/patches/server/0949-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0951-Fix-force-opening-enchantment-tables.patch rename to patches/server/0949-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0952-Add-Entity-Body-Yaw-API.patch b/patches/server/0950-Add-Entity-Body-Yaw-API.patch similarity index 87% rename from patches/server/0952-Add-Entity-Body-Yaw-API.patch rename to patches/server/0950-Add-Entity-Body-Yaw-API.patch index d678f5f776..44d216b486 100644 --- a/patches/server/0952-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0950-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a77f626f79db9a10367bcd51ae946f93fea6ee69..aec588b41f19b2147a4e7267bafa417fbcf7abc0 100644 +index daf6653f30337ef88bad9decb7d73c45f951b270..d43859f8aa7beed82dd3a146bb1086982cd0cda7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1034,6 +1034,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1035,6 +1035,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot); } diff --git a/patches/server/0953-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0953-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0954-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0954-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0955-Add-EntityFertilizeEggEvent.patch b/patches/server/0953-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0955-Add-EntityFertilizeEggEvent.patch rename to patches/server/0953-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0956-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0956-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0957-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0957-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0958-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0956-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0958-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0956-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0959-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0957-Fix-advancement-triggers-for-entity-damage.patch similarity index 97% rename from patches/server/0959-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0957-Fix-advancement-triggers-for-entity-damage.patch index 585ee6a4dd..e5025e0d38 100644 --- a/patches/server/0959-Fix-advancement-triggers-for-entity-damage.patch +++ b/patches/server/0957-Fix-advancement-triggers-for-entity-damage.patch @@ -23,7 +23,7 @@ index ee9222406bcaef1a1ac09b60a142044c70d31fce..7016ef3f6d56980f36b9f2fb38252636 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 e9d3e34520b706627205e0d5b17b25e09f198e7e..dcfb71b5a53df789e366fea2080921d677549a2e 100644 +index d13fd686ce449f32d4916a86ee66fcc3df648b80..95a27d28f73039693ca64601954af62028413634 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2239,7 +2239,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0960-Fix-text-display-error-on-spawn.patch b/patches/server/0958-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0960-Fix-text-display-error-on-spawn.patch rename to patches/server/0958-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0961-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0959-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0961-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0959-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0962-Add-Shearable-API.patch b/patches/server/0960-Add-Shearable-API.patch similarity index 100% rename from patches/server/0962-Add-Shearable-API.patch rename to patches/server/0960-Add-Shearable-API.patch diff --git a/patches/server/0963-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0963-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0964-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0964-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0965-Optimize-Hoppers.patch b/patches/server/0963-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0965-Optimize-Hoppers.patch rename to patches/server/0963-Optimize-Hoppers.patch diff --git a/patches/server/0966-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0964-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0966-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0964-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0967-Fix-api-checking-banned-ips.patch b/patches/server/0965-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0967-Fix-api-checking-banned-ips.patch rename to patches/server/0965-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0968-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0968-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0969-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0967-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0969-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0967-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0970-remove-duplicate-animate-packet-for-records.patch b/patches/server/0968-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0970-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0968-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0971-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0971-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0972-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0972-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0973-Use-array-for-gamerule-storage.patch b/patches/server/0971-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0973-Use-array-for-gamerule-storage.patch rename to patches/server/0971-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0974-Fix-block-place-logic.patch b/patches/server/0972-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0974-Fix-block-place-logic.patch rename to patches/server/0972-Fix-block-place-logic.patch