Updated Upstream (CraftBukkit) (#8548)

patches/server/0009-Adventure.patch

@@ -1959,7 +1959,7 @@ index d7ece1ae4e9c97935de96eafd6d22cded1f8aa42..77cb412656e741fdb7e002011e3a99ac
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e5c0e5ea8 100644
+index c20f7eb3ee60fce38be2c817278ecaac8982b279..d7e66a9669c67bf7d619bf69dc49daed42b3e83a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -154,6 +154,7 @@ import net.minecraft.world.scores.Score;
@@ -2013,7 +2013,7 @@ index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e
  
              this.connection.send(new ClientboundPlayerCombatKillPacket(this.getCombatTracker(), ichatbasecomponent), PacketSendListener.exceptionallySend(() -> {
                  boolean flag1 = true;
-@@ -1730,8 +1728,13 @@ public class ServerPlayer extends Player {
+@@ -1738,8 +1736,13 @@ public class ServerPlayer extends Player {
      }
  
      public void sendChatMessage(OutgoingPlayerChatMessage message, boolean filterMaskEnabled, ChatType.Bound params) {
@@ -2028,7 +2028,7 @@ index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e
          }
  
      }
-@@ -1752,6 +1755,7 @@ public class ServerPlayer extends Player {
+@@ -1760,6 +1763,7 @@ public class ServerPlayer extends Player {
      }
  
      public String locale = "en_us"; // CraftBukkit - add, lowercase
@@ -2036,7 +2036,7 @@ index bdad7b404067ab65d85d1628db9009896a43a052..5aad3da061d391d1003bdcca95dd4f7e
      public void updateOptions(ServerboundClientInformationPacket packet) {
          // CraftBukkit start
          if (getMainArm() != packet.mainHand()) {
-@@ -1763,6 +1767,10 @@ public class ServerPlayer extends Player {
+@@ -1771,6 +1775,10 @@ public class ServerPlayer extends Player {
              this.server.server.getPluginManager().callEvent(event);
          }
          this.locale = packet.language;

patches/server/0043-Implement-PlayerLocaleChangeEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 301f78d1f9a0eae05096de071bda7def3a45f648..54f585f12890c665a097845acfe13108691f12b6 100644
+index 54dc00f521e7f7b4cb86b2653ac1d0058dcbb03b..0590fb50330b5387a25e7fc7139e04586999efc6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1755,7 +1755,7 @@ public class ServerPlayer extends Player {
+@@ -1763,7 +1763,7 @@ public class ServerPlayer extends Player {
          return s;
      }
  
@@ -17,7 +17,7 @@ index 301f78d1f9a0eae05096de071bda7def3a45f648..54f585f12890c665a097845acfe13108
      public java.util.Locale adventure$locale = java.util.Locale.US; // Paper
      public void updateOptions(ServerboundClientInformationPacket packet) {
          // CraftBukkit start
-@@ -1763,9 +1763,10 @@ public class ServerPlayer extends Player {
+@@ -1771,9 +1771,10 @@ public class ServerPlayer extends Player {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }

patches/server/0122-Properly-fix-item-duplication-bug.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2ffce1200abe7ab7b50a187069e63392c0b3bfdd..776d2b38f284e13ec9a7dd67a538626817c79887 100644
+index 3cea2ceb5d30329aa84f6659330eea075387fe18..0fded4890038de77781c27565fa3c8fe60e50aac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2195,7 +2195,7 @@ public class ServerPlayer extends Player {
+@@ -2203,7 +2203,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {

patches/server/0217-InventoryCloseEvent-Reason-API.patch

@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a6ec766634e804263d55efe9df7d7fbe14d05946..65cf330708b4667fd60fdb1094df5a808ae5c2f2 100644
+index eea1a5c22b6aebf1ff9f5746d1fd0c247ee2631d..54ec2d33bf0306e5d4f6be99a3d9b37c93b26aec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1270,7 +1270,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index a6ec766634e804263d55efe9df7d7fbe14d05946..65cf330708b4667fd60fdb1094df5a80
              }
              // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d..1a3f9d09df6b6d8c6a84f7f62e142f341d74c6c1 100644
+index 81a0407256a3a37e8ccb136e7fd602d95106c590..bc0c4c2284d08ca88d4664bb39c744b36a607dcd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -611,7 +611,7 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index 91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d..1a3f9d09df6b6d8c6a84f7f62e142f34
          }
  
          net.kyori.adventure.text.Component deathMessage = event.deathMessage() != null ? event.deathMessage() : net.kyori.adventure.text.Component.empty(); // Paper - Adventure
-@@ -1442,7 +1442,7 @@ public class ServerPlayer extends Player {
+@@ -1450,7 +1450,7 @@ public class ServerPlayer extends Player {
          }
          // CraftBukkit end
          if (this.containerMenu != this.inventoryMenu) {
@@ -59,7 +59,7 @@ index 91f258aa1d4b888b1e1c604ce5f1cf0d755adb9d..1a3f9d09df6b6d8c6a84f7f62e142f34
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1470,7 +1470,13 @@ public class ServerPlayer extends Player {
+@@ -1478,7 +1478,13 @@ public class ServerPlayer extends Player {
  
      @Override
      public void closeContainer() {
@@ -104,7 +104,7 @@ index 116dee1f1f9c489e6f85a8fa3b7f36267109d720..ea2f283634c8794bda3e531a20f39f8a
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 399735c923cfd52bd7b67beb9b974585ab507ca9..a99d6938d912a169ac329ba09f5a6becd072a94e 100644
+index 4dcc44b925ac261aaa2f4ee84e321d6c8852e835..a462b33a35bf2e5ea9492eb37ac689830abd392a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -508,7 +508,7 @@ public abstract class PlayerList {

patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch

@@ -19,10 +19,10 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 645012ea3590a46773e2bb14e9cafd9e3c695fd4..cb55e38b22330dbc542003841e8140eb6bee01bf 100644
+index 6fa11d19b0a9858448fb22624c1d1a2fb228a3b4..942081c458f597d7a0ff7b3478b4b1bf93e8b30d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1876,14 +1876,58 @@ public class ServerPlayer extends Player {
+@@ -1884,14 +1884,58 @@ public class ServerPlayer extends Player {
      }
  
      public void setCamera(@Nullable Entity entity) {

patches/server/0276-Reset-players-airTicks-on-respawn.patch

@@ -5,10 +5,10 @@ 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 cb55e38b22330dbc542003841e8140eb6bee01bf..32aba4c822742d6a2ebbc25b169ffb665e9413f7 100644
+index 942081c458f597d7a0ff7b3478b4b1bf93e8b30d..2f2def50a4dde2a949176da1030773e59521fb9a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2289,6 +2289,7 @@ public class ServerPlayer extends Player {
+@@ -2297,6 +2297,7 @@ public class ServerPlayer extends Player {
  
          this.setHealth(this.getMaxHealth());
          this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset

patches/server/0287-force-entity-dismount-during-teleportation.patch

@@ -20,10 +20,10 @@ 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 32aba4c822742d6a2ebbc25b169ffb665e9413f7..135e61ffa69a56e7c5edcd9e2066334abf963340 100644
+index 2f2def50a4dde2a949176da1030773e59521fb9a..c9aae32186b72723e879ffab50d73ade5a665a64 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1336,11 +1336,13 @@ public class ServerPlayer extends Player {
+@@ -1344,11 +1344,13 @@ public class ServerPlayer extends Player {
          }
      }
  

patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch

@@ -5,10 +5,10 @@ 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 e8ca0d8612e132fac5533b7672d0fccbf1bc9e24..f45e8b4a536d0cef9b295083f95a556b87fcd2fc 100644
+index 2f6fbceac68e173f3ba3d887407e44b22bfbc5de..f6b28eece6dc4f8d1b483ed2bfb6c9504d625bc8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1578,6 +1578,13 @@ public class ServerPlayer extends Player {
+@@ -1586,6 +1586,13 @@ public class ServerPlayer extends Player {
      public void disconnect() {
          this.disconnected = true;
          this.ejectPassengers();

patches/server/0381-Prevent-opening-inventories-when-frozen.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index eb0e5c43b995e778d28ecfad813ca3882cabe0fa..baff31a9dd003eef6191b59598523e387bc759a1 100644
+index 84bcabdd92cefe16f7bf5270e1d2989dd7d010d7..90992b652941365a46f9e01985365447ba2ff461 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -622,7 +622,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index eb0e5c43b995e778d28ecfad813ca3882cabe0fa..baff31a9dd003eef6191b59598523e38
              this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
              this.containerMenu = this.inventoryMenu;
          }
-@@ -1492,7 +1492,7 @@ public class ServerPlayer extends Player {
+@@ -1500,7 +1500,7 @@ public class ServerPlayer extends Player {
              } else {
                  // CraftBukkit start
                  this.containerMenu = container;

patches/server/0383-Implement-Player-Client-Options-API.patch

@@ -85,10 +85,10 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index baff31a9dd003eef6191b59598523e387bc759a1..a25be75e636fa1bac4890da3fa9db9267382c46d 100644
+index 90992b652941365a46f9e01985365447ba2ff461..fd2bc49f713cccdcb2a3e49db52f56374690c5de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1853,9 +1853,24 @@ public class ServerPlayer extends Player {
+@@ -1861,9 +1861,24 @@ public class ServerPlayer extends Player {
          return s;
      }
  

patches/server/0522-Player-Chunk-Load-Unload-Events.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c841cfba25d6f448fec929b3ca9653775d3e0ac9..826dcafaf65cef8bbff4f231f71305e851de0902 100644
+index 67cf1cd5f3a83a52dca54781670dcfe0cf2a89c2..e74d4523caa4d2d4b33e22145f7b2dcb63dba9fc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2133,11 +2133,21 @@ public class ServerPlayer extends Player {
+@@ -2141,11 +2141,21 @@ public class ServerPlayer extends Player {
  
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
          this.connection.send(chunkDataPacket);

patches/server/0623-call-PortalCreateEvent-players-and-end-platform.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 12 May 2021 03:21:22 -0700
-Subject: [PATCH] call PortalCreateEvent players and end platform
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index becbe9c488577e1acea8ae1dac9792f4a25c2c66..498194b77e0efd97e59ef2adbcbc08526e925ace 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1193,15 +1193,21 @@ public class ServerPlayer extends Player {
-     private void createEndPlatform(ServerLevel world, BlockPos centerPos) {
-         BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable();
- 
-+        org.bukkit.craftbukkit.util.BlockStateListPopulator blockList = new org.bukkit.craftbukkit.util.BlockStateListPopulator(world); // Paper
-         for (int i = -2; i <= 2; ++i) {
-             for (int j = -2; j <= 2; ++j) {
-                 for (int k = -1; k < 3; ++k) {
-                     BlockState iblockdata = k == -1 ? Blocks.OBSIDIAN.defaultBlockState() : Blocks.AIR.defaultBlockState();
- 
--                    world.setBlockAndUpdate(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata);
-+                    blockList.setBlock(blockposition_mutableblockposition.set(centerPos).move(j, k, i), iblockdata, 3); // Paper
-                 }
-             }
-         }
-+        // Paper start
-+        if (new org.bukkit.event.world.PortalCreateEvent((List< org.bukkit.block.BlockState>) (List) blockList.getList(), world.getWorld(), this.getBukkitEntity(), org.bukkit.event.world.PortalCreateEvent.CreateReason.END_PLATFORM).callEvent()) {
-+            blockList.updateList();
-+        }
-+        // Paper end
- 
-     }
- 

patches/server/0627-additions-to-PlayerGameModeChangeEvent.patch

@@ -45,10 +45,10 @@ index 65089c0e78c9913a92ae9c66d664f48e2112ad92..7882ee2b7813d437d3b7580f046f38e7
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 498194b77e0efd97e59ef2adbcbc08526e925ace..4090b258672ac136172f3148bf1e297f270d4d93 100644
+index 781bad6dd4279eddeaa2d55eaf513ef725729d26..f033a1a2bb3e44d30107bf1494b315cdc0c94b56 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1795,8 +1795,15 @@ public class ServerPlayer extends Player {
+@@ -1797,8 +1797,15 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -66,7 +66,7 @@ index 498194b77e0efd97e59ef2adbcbc08526e925ace..4090b258672ac136172f3148bf1e297f
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -1808,7 +1815,7 @@ public class ServerPlayer extends Player {
+@@ -1810,7 +1817,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -75,7 +75,7 @@ index 498194b77e0efd97e59ef2adbcbc08526e925ace..4090b258672ac136172f3148bf1e297f
          }
      }
  
-@@ -2224,6 +2231,16 @@ public class ServerPlayer extends Player {
+@@ -2226,6 +2233,16 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {

patches/server/0630-Move-range-check-for-block-placing-up.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index de4c3849cc60151de8f3a873adad2bc36e30fbc4..3ef39ebeb76f43d521266402e170bd1af6af2348 100644
+index cf5aac0c7bb719246b49a0ee08148141a381a16a..3fcd92c408258a60de049437478f6dab010f1fb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1830,6 +1830,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0636-Add-cause-to-Weather-ThunderChangeEvents.patch

@@ -95,7 +95,7 @@ index 401787a5b55384b9ab7755e822b3b881dc45ac45..e537a8df45c31efa80cb898cbef9c3a0
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 888090b2548fb23089dcd05e9de2b1f09dc5876a..b39a9924f6dd8facc8f22b3e98f5a48cdd555f4c 100644
+index c801ba30f7d5fc891adc3dad7ee8e2d78e7ac359..b1382dab98963b362c49d2e8f1a97177eadeb22d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1184,7 +1184,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0651-add-per-world-spawn-limits.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b39a9924f6dd8facc8f22b3e98f5a48cdd555f4c..5f780daddfc90c44bd621cee7a2a72a20b292e29 100644
+index b1382dab98963b362c49d2e8f1a97177eadeb22d..684e091e7eb68a3e9157e7b945248821553a03df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -210,6 +210,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0654-Fix-PlayerDropItemEvent-using-wrong-item.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4090b258672ac136172f3148bf1e297f270d4d93..3ad77356734253f98cc92dd734d1171060dca62d 100644
+index f033a1a2bb3e44d30107bf1494b315cdc0c94b56..5bbc8f5f1f5c66ae6d1128d87fb7dde0b546387e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2200,7 +2200,7 @@ public class ServerPlayer extends Player {
+@@ -2202,7 +2202,7 @@ public class ServerPlayer extends Player {
  
              if (retainOwnership) {
                  if (!itemstack1.isEmpty()) {

patches/server/0656-Ensure-disconnect-for-book-edit-is-called-on-main.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 55c5348e793fa560d7042cf90076a8f7a3b76547..63bfea707e0664e19726692546dd0ac8a86f8b8f 100644
+index 1673082e5badbc0f3057b11544fb39be0ed84a44..8d41767c0bbd55c3c3f291fee8ba92622c3cc881 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1213,7 +1213,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0660-Adds-PlayerArmSwingEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 63bfea707e0664e19726692546dd0ac8a86f8b8f..7d594e23dc7c393f258b16ec5f04e60fc31f91c8 100644
+index 8d41767c0bbd55c3c3f291fee8ba92622c3cc881..42f525b6e7bccca420abccfc2da80ead20966559 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2631,7 +2631,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0661-Fixes-kick-event-leave-message-not-being-sent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3ad77356734253f98cc92dd734d1171060dca62d..ca07a861d9005de51134152ef72dcbd3505f1baa 100644
+index 5bbc8f5f1f5c66ae6d1128d87fb7dde0b546387e..e505fa3a6f90efec32e408a08a31295ae829ac2c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -259,7 +259,6 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 3ad77356734253f98cc92dd734d1171060dca62d..ca07a861d9005de51134152ef72dcbd3
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7d594e23dc7c393f258b16ec5f04e60fc31f91c8..ebaf6ddcdccf4e2a5836782e58770e2cf1008f9d 100644
+index 42f525b6e7bccca420abccfc2da80ead20966559..ff31434e372693f6cf3d6a94815abd2ceb76f2d0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -522,7 +522,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0664-Don-t-apply-cramming-damage-to-players.patch

@@ -11,10 +11,10 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ca07a861d9005de51134152ef72dcbd3505f1baa..95e2cbe6f80e64c00e8e261a3e1731c73845fc83 100644
+index e505fa3a6f90efec32e408a08a31295ae829ac2c..b335d10dcc2f23c6b7b9976b33af5ab2f221f15c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1431,7 +1431,7 @@ public class ServerPlayer extends Player {
+@@ -1433,7 +1433,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {

patches/server/0673-Prevent-AFK-kick-while-watching-end-credits.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ebaf6ddcdccf4e2a5836782e58770e2cf1008f9d..a4ed338b3317378fdad694d3b0b12379128ffd26 100644
+index ff31434e372693f6cf3d6a94815abd2ceb76f2d0..847011d143efb3f3af815d87dcc9c923d95a43c7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -438,7 +438,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0675-Add-PlayerSetSpawnEvent.patch

@@ -32,10 +32,10 @@ index ce1c7512cc368e196ae94ee22c6a228c975b4980..1e41de9523c5fa3b9cfced798a5c35a2
          String string = resourceKey.location().toString();
          if (targets.size() == 1) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 95e2cbe6f80e64c00e8e261a3e1731c73845fc83..218a71cbd62795fdf3b9b3ad224e201b1e97a5b6 100644
+index b335d10dcc2f23c6b7b9976b33af5ab2f221f15c..e212f7a2f20fb5b8af18f3f11aef189d7d533160 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1272,7 +1272,7 @@ public class ServerPlayer extends Player {
+@@ -1274,7 +1274,7 @@ public class ServerPlayer extends Player {
              } else if (this.bedBlocked(blockposition, enumdirection)) {
                  return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
              } else {
@@ -44,7 +44,7 @@ index 95e2cbe6f80e64c00e8e261a3e1731c73845fc83..218a71cbd62795fdf3b9b3ad224e201b
                  if (this.level.isDay()) {
                      return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
-@@ -2127,12 +2127,33 @@ public class ServerPlayer extends Player {
+@@ -2129,12 +2129,33 @@ public class ServerPlayer extends Player {
          return this.respawnForced;
      }
  
@@ -80,7 +80,7 @@ index 95e2cbe6f80e64c00e8e261a3e1731c73845fc83..218a71cbd62795fdf3b9b3ad224e201b
              }
  
              this.respawnPosition = pos;
-@@ -2146,6 +2167,7 @@ public class ServerPlayer extends Player {
+@@ -2148,6 +2169,7 @@ public class ServerPlayer extends Player {
              this.respawnForced = false;
          }
  

patches/server/0691-Add-methods-to-find-targets-for-lightning-strikes.patch

@@ -29,7 +29,7 @@ index 304002cab34cdbb000f22d18ee94ffe233ac2b8e..7d35d948e395258c77301c3dfee57254
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5f780daddfc90c44bd621cee7a2a72a20b292e29..0d5ae9b6db5cba4154c1e3ac042ae27fcd84d209 100644
+index 684e091e7eb68a3e9157e7b945248821553a03df..ef1b84c52722e33f1f3d346df60c11d5bb805a0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -686,6 +686,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0703-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch

@@ -28,10 +28,10 @@ index 7d35d948e395258c77301c3dfee572545d3e52ff..34c587232c6bb9876de68f4bf07d11b3
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 218a71cbd62795fdf3b9b3ad224e201b1e97a5b6..ffee74216d6ba1742e97400a7177725766bb557e 100644
+index e212f7a2f20fb5b8af18f3f11aef189d7d533160..eac88fdb3c9184e9c0d3500c62fbc34958bfcb47 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1573,6 +1573,18 @@ public class ServerPlayer extends Player {
+@@ -1575,6 +1575,18 @@ public class ServerPlayer extends Player {
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
          this.doCloseContainer();
      }

patches/server/0706-Add-paper-mobcaps-and-paper-playermobcaps.patch

@@ -302,7 +302,7 @@ index 3ebf81b45cf1897471a3262d23cc59dd45652b6d..c648acdd0066f6c480d08927a3c72524
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0d5ae9b6db5cba4154c1e3ac042ae27fcd84d209..4fcd36e6c0ad99575917962fbd1353f509383482 100644
+index ef1b84c52722e33f1f3d346df60c11d5bb805a0b..80abef83b4b2533fdc50773d4d76c3c6af662df1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1701,9 +1701,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0710-Optimise-chunk-tick-iteration.patch

@@ -72,7 +72,7 @@ index a61f55ed1fbe5aac5289014cb95cb6950b4c77fa..e11ec87e8007979a1c6932b414bcd70c
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ed6e0a186dba26bee5ebcc02120c24ecb38d6892..bfc1965482fe6556caa09306767583e3635b06c8 100644
+index a488c33ce546cd29b30fcff9748869c20fc835aa..d91dbffab2c541bd3ca5542026f1a000f9b114d3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;