Update modern forwarding to v3 (#8219)

2025-03-28 09:17:21 +01:00 · 2022-08-08 15:25:41 +00:00 · 2022-08-08 15:25:41 +00:00 · c7e118b394
commit c7e118b394
parent 78b19f89a4
660 changed files with 211 additions and 204 deletions
--- a/patches/server/0273-Add-more-Witch-API.patch
+++ b/patches/server/0273-Add-more-Witch-API.patch
--- a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
--- a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ec50cc71758d0178dfb9a9b70e8fc9050d530f3..d3addc9dbef86ab75707c647b2fce8edbf8b9fba 100644
+index 64d80c0329fd9fc8fa2411805adc9d90626bdc4f..475b2165ae56b76a02b80c95b68fdbc03199d5e6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -568,9 +568,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0276-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0276-Reset-players-airTicks-on-respawn.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e4f991578d4ee581e65f2edb7d32640ff36a01bd..c5120e5e7414a6b870eab877605e9bb52db3e8cb 100644
+index be79f80270a7400451dcaac55fba8d3ab7bdda52..5f10a2d21553a8dc8c03ea5951190860ee5a4615 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2288,6 +2288,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
--- a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@ -58,7 +58,7 @@ index 336a26733b5bf73455f8ec10347c1e08b8e866f7..4fce18c52c8144460ebf0c1e336dce71
         return executorService;
     }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 95f0525bd4ad62853559cc60d5d2b707cffcb727..202802af054b32beb0dc0d5a7f1dbde8748036c1 100644
+index 560e213f39d82613bd1bfcfb4eb3bd7aeed1c0c6..3d1c7bfeafbad2c5b7275f75d263a3817bd3a8aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -306,6 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
--- a/patches/server/0279-Optimize-World-Time-Updates.patch
+++ b/patches/server/0279-Optimize-World-Time-Updates.patch
@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 202802af054b32beb0dc0d5a7f1dbde8748036c1..1a76a4239213c7b8dc40e656164427c1c4f7c2cf 100644
+index 3d1c7bfeafbad2c5b7275f75d263a3817bd3a8aa..89c0c0d0d3458f38a1a0b91617b84f439af667c8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1378,12 +1378,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
--- a/patches/server/0280-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0280-Restore-custom-InventoryHolder-support.patch
--- a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
--- a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
--- a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
@ -59,7 +59,7 @@ index 53717a4a2bfd841346c00b5f854899e23661122c..3fadf6b46cc722ad81cf810c0761cf71
 
                 this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d3addc9dbef86ab75707c647b2fce8edbf8b9fba..ed64fc9f6401fcd57478fa92d7f03e9b931d2dcb 100644
+index 475b2165ae56b76a02b80c95b68fdbc03199d5e6..ef180347fc39b2b6b8665284d967103c26aaddbd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1672,6 +1672,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0284-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0284-Make-the-default-permission-message-configurable.patch
@ -18,7 +18,7 @@ index b3a58bf4b654e336826dc04da9e2f80ff8b9a9a7..cd4936ef114b504df8649fba8f1823d9
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59ce840dadcecf9c6aed77747a06519eca5fea90..6031bc3ada3fd7f2389f00b6d9e37db13e242282 100644
+index 21f0e1a23d6e9c6c76abfa9af555642fadeba69c..12d789b0abef2dc0e0965579830ad6d341717ba4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2615,6 +2615,16 @@ public final class CraftServer implements Server {
--- a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
--- a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.

 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 30073d1e0c61ad94119fc0859a17b011087b6fcc..83c5264e4af146d3712cee4550d84c824a3a96d6 100644
+index 2643c3d99c11bc6783386502c7e21293b6dfa345..07fd527dd5b72ecc66311c1b81e578158e12a35c 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
@@ -126,6 +126,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
--- a/patches/server/0287-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0287-force-entity-dismount-during-teleportation.patch
@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ca3206ad7c6e4acf31eda406c439fc7c70e47c01..f95e8e53fc0438858921446f44279f747414b12f 100644
+index 5f10a2d21553a8dc8c03ea5951190860ee5a4615..b81314654d562036680666bd95be4ec21d9b66e1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1335,11 +1335,13 @@ public class ServerPlayer extends Player {
--- a/patches/server/0288-Add-more-Zombie-API.patch
+++ b/patches/server/0288-Add-more-Zombie-API.patch
--- a/patches/server/0289-Book-Size-Limits.patch
+++ b/patches/server/0289-Book-Size-Limits.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ed64fc9f6401fcd57478fa92d7f03e9b931d2dcb..88f58eeaf2566bdee2f6e44ddc1187f762345347 100644
+index ef180347fc39b2b6b8665284d967103c26aaddbd..19924f3d45af6c4006bd2d921cbeab67a4846059 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1121,6 +1121,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0290-Add-PlayerConnectionCloseEvent.patch
@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.

 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 83c5264e4af146d3712cee4550d84c824a3a96d6..f6162d65d341ef3df1a9b3f45d7d0c25d52f35cf 100644
+index 07fd527dd5b72ecc66311c1b81e578158e12a35c..527acbc15f3fe30541eef555480e158ab83a6130 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
@@ -439,6 +439,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
--- a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
--- a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f95e8e53fc0438858921446f44279f747414b12f..eaf95c84896f71f36e250b3a07bb504230e4d85d 100644
+index b81314654d562036680666bd95be4ec21d9b66e1..3f9b13048eff59094a229d1a41d219bbd7f3eb01 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -230,6 +230,7 @@ public class ServerPlayer extends Player {
@ -28,7 +28,7 @@ index f95e8e53fc0438858921446f44279f747414b12f..eaf95c84896f71f36e250b3a07bb5042
     public boolean queueHealthUpdatePacket = false;
     public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 734a7b101e5ac9ac4ceb0ba3cb74b94bf2c18683..f6f086d1e5f08e5beae142685cfb682b8e5683f1 100644
+index f8ad63b05ece77cf973ef41ef40111780f0d2d04..bb0c40246f70deecf10b9540d6cba7f65cc91372 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -178,6 +178,7 @@ public abstract class PlayerList {
@ -106,7 +106,7 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..d7823d7dc88cfba6f6ac9dae220e03de
     public Location getLastDeathLocation() {
         if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index df164a6fe8d53d34db93f4f1f2af6a9c1c98a7e8..500c1a317f58c1b24ae1b7cbcd101f1d327e3ae8 100644
+index 0fcde65af63c4fcfbbef5875bec759b209cfd5f1..1a7f5978ad9ab1ee15f2e40e8109cf6dad5f890c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -168,6 +168,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index eaf95c84896f71f36e250b3a07bb504230e4d85d..dff1961404ccbc767624e32a1c5158cbbe63d9f7 100644
+index 3f9b13048eff59094a229d1a41d219bbd7f3eb01..3d85bf30b146401bfdbc4056cdbf03f263b4e9a9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1577,6 +1577,13 @@ public class ServerPlayer extends Player {
--- a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.

 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 500c1a317f58c1b24ae1b7cbcd101f1d327e3ae8..f201e1b7f4487ce79e296b74e71ed959568fd0ad 100644
+index 1a7f5978ad9ab1ee15f2e40e8109cf6dad5f890c..8a349c179e9abcda140546c56ea884422b409b5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2557,6 +2557,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/patches/server/0295-BlockDestroyEvent.patch
+++ b/patches/server/0295-BlockDestroyEvent.patch
--- a/patches/server/0296-Async-command-map-building.patch
+++ b/patches/server/0296-Async-command-map-building.patch
--- a/patches/server/0297-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0297-Implement-Brigadier-Mojang-API.patch
--- a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
--- a/patches/server/0299-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0299-Limit-Client-Sign-length-more.patch
--- a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
--- a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
--- a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
--- a/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
--- a/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f6f086d1e5f08e5beae142685cfb682b8e5683f1..cf344d87a31d03d87be1df38b772b5301f53e7e7 100644
+index bb0c40246f70deecf10b9540d6cba7f65cc91372..d20954b8d8683d6380ce9f4d87bd2e3a78f7488d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1128,6 +1128,7 @@ public abstract class PlayerList {
--- a/patches/server/0305-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0305-Entity-getEntitySpawnReason.patch
@ -22,7 +22,7 @@ index 293657617c32acfe70b0ab98939135e5ac6dae28..6ba45e1322b0d04433b2aac23413a9cd
             // Paper start
             if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cf344d87a31d03d87be1df38b772b5301f53e7e7..9ef845190b47263da8e89c4269d613f6cbf74535 100644
+index d20954b8d8683d6380ce9f4d87bd2e3a78f7488d..7205f17da0383b22b6267843c92b31d8c0556caa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -347,7 +347,7 @@ public abstract class PlayerList {
--- a/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
--- a/patches/server/0307-Fire-event-on-GS4-query.patch
+++ b/patches/server/0307-Fire-event-on-GS4-query.patch
--- a/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0308-Implement-PlayerPostRespawnEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9ef845190b47263da8e89c4269d613f6cbf74535..8c7286176b96bcd6640a78255e0effc22ce06457 100644
+index 7205f17da0383b22b6267843c92b31d8c0556caa..ee4d2f625629cf74f923592f11ecdb312de0c3ff 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -727,9 +727,14 @@ public abstract class PlayerList {
--- a/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
--- a/patches/server/0310-Server-Tick-Events.patch
+++ b/patches/server/0310-Server-Tick-Events.patch
--- a/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dff1961404ccbc767624e32a1c5158cbbe63d9f7..78603883ca3246fa411b37fb84497dbb08d9adf0 100644
+index 3d85bf30b146401bfdbc4056cdbf03f263b4e9a9..02e81ba08b84f845b57a5148825ceb63313213a6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -775,6 +775,46 @@ public class ServerPlayer extends Player {
--- a/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
--- a/patches/server/0313-Add-Heightmap-API.patch
+++ b/patches/server/0313-Add-Heightmap-API.patch
--- a/patches/server/0314-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0314-Mob-Spawner-API-Enhancements.patch
--- a/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e2bcaa862c6d69e0989587deb42f2e9adcb971df..18395a47a9d44784359b07e8478229fa202bea9a 100644
+index 90af6b5e7f6188eec4a4e311a0d273857d3d1c5c..db079ad6516eba21915713be4d99f9566da47945 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -516,7 +516,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
--- a/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@ -29,7 +29,7 @@ index 8c48544daae0f18a39511df12f7066fc0e383d2c..49fe89baab93ae99a990684d78c5c05a
 
     public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6031bc3ada3fd7f2389f00b6d9e37db13e242282..eeff73b8b0a8b866ddb139ce6da074bd67463eb4 100644
+index 12d789b0abef2dc0e0965579830ad6d341717ba4..45c88bfdbc004ff59faae25eacdd72e611034c30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2073,7 +2073,7 @@ public final class CraftServer implements Server {
--- a/patches/server/0318-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0318-Implement-CraftBlockSoundGroup.patch
--- a/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4a1a3fd8a6f5b9008cfdad6cb1b20393f8a20530..c774a2e9b55ccb124e923102496af322a9fc1962 100644
+index 49fe89baab93ae99a990684d78c5c05a223282c1..5cab48d7db58446310226acfae0dc3fcc1dba920 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -729,31 +729,34 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
--- a/patches/server/0320-ChunkMapDistance-CME.patch
+++ b/patches/server/0320-ChunkMapDistance-CME.patch
--- a/patches/server/0321-Chunk-debug-command.patch
+++ b/patches/server/0321-Chunk-debug-command.patch
--- a/patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch
--- a/patches/server/0323-Expose-the-internal-current-tick.patch
+++ b/patches/server/0323-Expose-the-internal-current-tick.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eeff73b8b0a8b866ddb139ce6da074bd67463eb4..97a0bb12b1158618e86bb0fbab64985faa3d1cec 100644
+index 45c88bfdbc004ff59faae25eacdd72e611034c30..6463aeed288c3bb06075107a91a70e66e1420448 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2656,5 +2656,10 @@ public final class CraftServer implements Server {
--- a/patches/server/0324-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0324-Fix-World-isChunkGenerated-calls.patch
--- a/patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch
--- a/patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
--- a/patches/server/0327-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0327-Configurable-projectile-relative-velocity.patch
--- a/patches/server/0328-offset-item-frame-ticking.patch
+++ b/patches/server/0328-offset-item-frame-ticking.patch
--- a/patches/server/0329-Fix-MC-158900.patch
+++ b/patches/server/0329-Fix-MC-158900.patch
@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8c7286176b96bcd6640a78255e0effc22ce06457..6f14cf3546cb0db210e39a918799c3df7998eb1d 100644
+index ee4d2f625629cf74f923592f11ecdb312de0c3ff..7ca5032574ddc4fb63dbf9ef266c71042055fb2a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -611,8 +611,10 @@ public abstract class PlayerList {
--- a/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
--- a/patches/server/0331-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0331-Dont-send-unnecessary-sign-update.patch
--- a/patches/server/0332-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0332-Add-option-to-disable-pillager-patrols.patch
--- a/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 43f2069542b71d158ad3ff959b224ddadc434383..20f26991faddffab45f7aadf35163101739b81cf 100644
+index 8138fbe3f991451134a179f3b0256f7d088375b8..84a1c8d7750a0a33c5f1338d0784e076ed223dac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1867,6 +1867,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0334-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0334-Flat-bedrock-generator-settings.patch
--- a/patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
--- a/patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch
--- a/patches/server/0337-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0337-Duplicate-UUID-Resolve-Option.patch
--- a/patches/server/0338-Optimize-Hoppers.patch
+++ b/patches/server/0338-Optimize-Hoppers.patch
--- a/patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 78603883ca3246fa411b37fb84497dbb08d9adf0..628ef18b5043504f206c6b60b7805892870e5736 100644
+index 02e81ba08b84f845b57a5148825ceb63313213a6..5dea577aeb4fa627e4c207b8a84933c1f2b63516 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -895,7 +895,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch
--- a/patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
--- a/patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch
--- a/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
--- a/patches/server/0344-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0344-Fix-items-not-falling-correctly.patch
--- a/patches/server/0345-Lag-compensate-eating.patch
+++ b/patches/server/0345-Lag-compensate-eating.patch
--- a/patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch
--- a/patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch
--- a/patches/server/0348-Add-effect-to-block-break-naturally.patch
+++ b/patches/server/0348-Add-effect-to-block-break-naturally.patch
--- a/patches/server/0349-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0349-Entity-Activation-Range-2.0.patch
--- a/patches/server/0350-Increase-Light-Queue-Size.patch
+++ b/patches/server/0350-Increase-Light-Queue-Size.patch
@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8be6de893f1df78afc0e2c023e548a50ff7c2629..b04c5433a1e2cdfe69c5b5cbe77b867ebd55c126 100644
+index a02b674a925f2e070ed1bd203de262b513aae0a5..181e35da5919ba3b91246b427f2c5773acf1dd12 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -780,7 +780,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
--- a/patches/server/0351-Fix-Light-Command.patch
+++ b/patches/server/0351-Fix-Light-Command.patch
--- a/patches/server/0352-Anti-Xray.patch
+++ b/patches/server/0352-Anti-Xray.patch
@ -1247,7 +1247,7 @@ index ae37e97e52557b48f129cc02eeea395378a48444..785fbcf9bafcdec1c5be213de3d85126
 
     public int getSerializedSize() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 78e20871e4bd8d92c4475f797a55733c68f6aeb4..723608946947fa2792c7284fa5faa85ab9507897 100644
+index 78e20871e4bd8d92c4475f797a55733c68f6aeb4..b688d239ff11b315f60cd980d8f6780b982a865b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
@@ -29,6 +29,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
@ -1551,7 +1551,7 @@ index cf48c93d89da53e0ec771e5c2c8582e30b35e3f5..518dfbb7dbd4221937636cf46d27109d
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 97a0bb12b1158618e86bb0fbab64985faa3d1cec..08dad640ae4315d0746587d91deb4709231c2bcc 100644
+index 6463aeed288c3bb06075107a91a70e66e1420448..36069181cde281f56ca6c6c8e4b127452a9176d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2228,7 +2228,7 @@ public final class CraftServer implements Server {
--- a/patches/server/0353-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0353-Implement-alternative-item-despawn-rate.patch
--- a/patches/server/0354-Tracking-Range-Improvements.patch
+++ b/patches/server/0354-Tracking-Range-Improvements.patch
--- a/patches/server/0355-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0355-Fix-items-vanishing-through-end-portal.patch
--- a/patches/server/0356-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0356-implement-optional-per-player-mob-spawns.patch
@ -377,7 +377,7 @@ index d66ec02b09bb7ae46aae8e55f00626139f074ae3..de5b80fce9757517e51f2ef55340e884
 
             this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 628ef18b5043504f206c6b60b7805892870e5736..75bcab623004159f36a5a976c7b6f69873a108dd 100644
+index 5dea577aeb4fa627e4c207b8a84933c1f2b63516..1796e81889d62b691b7a709616ce08f155733597 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -235,6 +235,11 @@ public class ServerPlayer extends Player {
--- a/patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
--- a/patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
--- a/patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch
--- a/patches/server/0360-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0360-Add-debug-for-sync-chunk-loads.patch
--- a/patches/server/0361-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0361-Remove-garbage-Java-version-check.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Remove garbage Java version check


 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index beb12dcc620d902594dbe6ba2893062fadb97dc5..9a5373304b445408244fe9850c10526d1df21855 100644
+index 2febe4c031cbd03a9d61dae64fbfa9312e5b752c..3472114c373d7b884d8ae24906e30daa039d0742 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -194,10 +194,6 @@ public class Main {
--- a/patches/server/0362-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0362-Add-ThrownEggHatchEvent.patch
--- a/patches/server/0363-Entity-Jump-API.patch
+++ b/patches/server/0363-Entity-Jump-API.patch
--- a/patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch
--- a/patches/server/0365-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0365-Make-the-GUI-graph-fancier.patch
--- a/patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
--- a/patches/server/0367-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0367-Validate-tripwire-hook-placement-before-update.patch
--- a/patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
--- a/patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch
--- a/patches/server/0370-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0370-Optimise-Chunk-getFluid.patch
--- a/patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
--- a/patches/server/0372-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0372-Add-tick-times-API-and-mspt-command.patch
@ -185,7 +185,7 @@ index 181e35da5919ba3b91246b427f2c5773acf1dd12..0612bf8ecc6e1b76d728fea852e850ab
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 08dad640ae4315d0746587d91deb4709231c2bcc..1043271c20d092e3133855335eaf75d9d533d984 100644
+index 36069181cde281f56ca6c6c8e4b127452a9176d8..aa6d408ab8898dc752f137c24e3b906611f76672 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2478,6 +2478,16 @@ public final class CraftServer implements Server {
--- a/Show more
+++ b/Show more