More more more more work

patches/server/0449-Fix-interact-event-not-being-called-sometimes.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <james.jenour@protonmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bf4b64f07f21d816eb866d23b290c2f5e5471c70..3d4ab22077eb358168b2959c3d1beb10b7104ab7 100644
+index bf4b64f07f21d816eb866d23b290c2f5e5471c70..b0c32f22960ab7f809768037b5014536ef894af9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1842,7 +1842,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -19,7 +19,7 @@ index bf4b64f07f21d816eb866d23b290c2f5e5471c70..3d4ab22077eb358168b2959c3d1beb10
                                      InteractionResult.Success enuminteractionresult_d = (InteractionResult.Success) enuminteractionresult;
  
 -                                    if (enuminteractionresult_d.swingSource() == InteractionResult.SwingSource.SERVER) {
-+                                if (enuminteractionresult_d.swingSource() == InteractionResult.SwingSource.SERVER && !this.player.gameMode.interactResult) {
++                                    if (enuminteractionresult_d.swingSource() == InteractionResult.SwingSource.SERVER && !this.player.gameMode.interactResult) { // Paper - Call interact event
                                          this.player.swing(enumhand, true);
                                      }
                                  }

patches/server/0492-Allow-using-signs-inside-spawn-protection.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d4ab22077eb358168b2959c3d1beb10b7104ab7..e23b1f98c4ea066e1c35e15454ed524a20f65b4d 100644
+index b0c32f22960ab7f809768037b5014536ef894af9..01771669a8f6aa70d0dbf00fc7a65c7af6233129 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1827,7 +1827,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0497-Don-t-ignore-result-of-PlayerEditBookEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e23b1f98c4ea066e1c35e15454ed524a20f65b4d..ddf2b9c6de079f55c3ac8836345c1e681f23fcac 100644
+index 01771669a8f6aa70d0dbf00fc7a65c7af6233129..b24b6b93a3615c7aa95f64c13df983d7afc9b974 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1219,7 +1219,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0507-fix-PlayerItemHeldEvent-firing-twice.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ddf2b9c6de079f55c3ac8836345c1e681f23fcac..47f925707d8756796ce169b7cbd8f2410b0b7104 100644
+index b24b6b93a3615c7aa95f64c13df983d7afc9b974..3f5cd2a2c86daef6659ee9614a9efb26c6f1ce28 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2014,6 +2014,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0524-Expand-PlayerGameModeChangeEvent.patch

@@ -134,7 +134,7 @@ index 546be40a8e4470fb5a6686072cdd342cdaa6fe15..e000a918230187f6841b03b7b0dd7368
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 47f925707d8756796ce169b7cbd8f2410b0b7104..f97bbed2b0098fb9b9b0a9e7c2a124e1370608cc 100644
+index 3f5cd2a2c86daef6659ee9614a9efb26c6f1ce28..774d087787067faee75d566e796d5b8c88a24f24 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2818,7 +2818,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0527-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 f97bbed2b0098fb9b9b0a9e7c2a124e1370608cc..10376b24e3a09c023a73a21a4499415589795423 100644
+index 774d087787067faee75d566e796d5b8c88a24f24..1691d0c4d1e58bfd996a534076398bfdf7680dc1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1814,6 +1814,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0530-Add-Unix-domain-socket-support.patch

@@ -87,7 +87,7 @@ index d6d7f1c446ba5507f67038ff27775ba75156f4a7..c63c194c44646e6bc1a5942655278701
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 10376b24e3a09c023a73a21a4499415589795423..979f2aa4716cd5ddc35e2d81a3de82af4b4c296e 100644
+index 1691d0c4d1e58bfd996a534076398bfdf7680dc1..7557842ce2d6ca19277a99ab9de5356b11b526b2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2631,6 +2631,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0536-Add-PlayerKickEvent-causes.patch

@@ -229,7 +229,7 @@ index f8ae8c8eff73e4e87eb34d0f2635517f1688a6f1..59d20fd62e850a38380d877cef95ed69
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 979f2aa4716cd5ddc35e2d81a3de82af4b4c296e..fffefbed068a339f0db607d6734be611b273bbcf 100644
+index 7557842ce2d6ca19277a99ab9de5356b11b526b2..022ccaf364da665f62c5ff428f0b419174558e3b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -361,7 +361,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0554-Add-PlayerArmSwingEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fffefbed068a339f0db607d6734be611b273bbcf..0a5abb1a580310cc26ce3d64e6f878bde3bbfd0a 100644
+index 022ccaf364da665f62c5ff428f0b419174558e3b..dc9cbd4636bff0db6c7308482413a844c04d8526 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2488,7 +2488,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0555-Fix-kick-event-leave-message-not-being-sent.patch

@@ -55,7 +55,7 @@ index 59d20fd62e850a38380d877cef95ed69cb46ecbd..fc242acade3ff06c9213428cde103cf0
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0a5abb1a580310cc26ce3d64e6f878bde3bbfd0a..1fb600d3e0f14940d911881ebbe24a6b57d3a81c 100644
+index dc9cbd4636bff0db6c7308482413a844c04d8526..94ecc56fb633ecc4ecbfb2f436fadaf2afbc7491 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1975,6 +1975,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0561-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 1fb600d3e0f14940d911881ebbe24a6b57d3a81c..2df548b68e56a309af4b89f8f1174dde3b046e7d 100644
+index 94ecc56fb633ecc4ecbfb2f436fadaf2afbc7491..7dfb5d176f88044f8416a2bff38b290d011de066 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -398,7 +398,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0590-Improve-and-expand-AsyncCatcher.patch

@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2df548b68e56a309af4b89f8f1174dde3b046e7d..dcc87047769094241a0f0b682dc31cc4767ab5e9 100644
+index 7dfb5d176f88044f8416a2bff38b290d011de066..7961fbf5c72dae1031ae583baee62a20587b177f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1651,6 +1651,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0603-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 dcc87047769094241a0f0b682dc31cc4767ab5e9..d76df6ed588b1109cdebf239884d4c9ce5de47a6 100644
+index 7961fbf5c72dae1031ae583baee62a20587b177f..7e46af4a325303df780a088ba8a0d8d4c719fa6b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -758,6 +758,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0667-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 d76df6ed588b1109cdebf239884d4c9ce5de47a6..f259e32509b0ac6a62ab203911f93cac6150d71d 100644
+index 7e46af4a325303df780a088ba8a0d8d4c719fa6b..1d2db5c0b1fbd98308659e878832cf7923b9eab0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -491,6 +491,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0694-Sanitize-sent-BlockEntity-NBT.patch

@@ -30,10 +30,10 @@ index ac900dfdc5c90e9e60d47efa734be8f0a5b20dca..ec1cb034d840633240f2b379b09f7d2f
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 09b85c4caa4ebaae1e8c2910b090c40a039a1be7..645a7ec0709cbd3c0cfbf75f7b8622a67515f74c 100644
+index b1ed43287d522e08a967ba751a851776351916e7..2356fd4bf4edb8a44312f772eeb8399b3a2fa216 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -390,6 +390,14 @@ public abstract class BlockEntity {
+@@ -377,6 +377,14 @@ public abstract class BlockEntity {
      }
      // CraftBukkit end
  

patches/server/0696-Prevent-entity-loading-causing-async-lookups.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4f9071362d556f6f7fd5948dab99e2d260ec60fd..8062809659eab4f3667e297fc085093d4eb64154 100644
+index f2572fec8989911803cbcf1110e670b005ae29b0..0ab366df0cdd6ccba64e355322ff134cce3b5f42 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -725,6 +725,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -729,6 +729,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          ProfilerFiller gameprofilerfiller = Profiler.get();
  
          gameprofilerfiller.push("entityBaseTick");

patches/server/0697-Throw-exception-on-world-create-while-being-ticked.patch

@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f9a5e19f74022a03cf82e44ab59a256abc08468e..d7e5c1a5963139ab0362b565a964c998b2a9691b 100644
+index fcc00d5b0be3d2adb92c8243ccca8d0190fcc413..75ca3bc86c9f70df4ddf29a454b8b2bc251b4b9f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -327,6 +327,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0699-Add-WardenAngerChangeEvent.patch

@@ -18,7 +18,7 @@ index 27e52ee93ab591e97f37705de64cb5b62c06e253..3d792957f27fd4bdfad8d76262a8e2a2
              int j = this.angerByUuid.removeInt(entity.getUUID());
              i += j;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index 71311d30459d495c57e6fcf0115e4f34a232f1ad..6180019da58b19d2595da508aed3196af922d587 100644
+index 136e43782c44869df96286c9cd75ed1faa762eec..c47ed605f0822effd58df4f875297ed015e1e57e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 @@ -482,6 +482,15 @@ public class Warden extends Monster implements VibrationSystem {

patches/server/0700-Add-option-for-strict-advancement-dimension-checks.patch

@@ -24,10 +24,10 @@ index 01b8f7024fbc965bc6a7f97f79ba3dec964ef769..801823d003a8e28a13fe90db4604cd09
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 705727a13c12a26d669cebe9ec2fb9d100b59e1d..0f7a07a22ee1db3fd96c06ce7248d9d5392bd14f 100644
+index 15158bec7e2ca90b45347ba09cf17f25e919f9cf..6236f5cbd32e9547bbb1312c322195e440dadc60 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1655,6 +1655,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -1646,6 +1646,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
          ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
          ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level());
  

patches/server/0702-Nameable-Banner-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Nameable Banner API
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
-index 01521f38871d821762ff7ac2d39927f8c6b861bf..98bc87fe5d153cc4927f7e1b4a02f61d9dd019a0 100644
+index 6a2bb16ac915c80316f05348ad15724ddc7e19b4..27fd8b88dc1433c1df1e09604a3cc546bfa0d2b9 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BannerBlockEntity.java
 @@ -29,7 +29,7 @@ public class BannerBlockEntity extends BlockEntity implements Nameable {

patches/server/0704-Prevent-empty-items-from-being-added-to-world.patch

@@ -7,10 +7,10 @@ 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 3e0563ae33a3ed8379939f92e72e9b9e0ea8ae3a..d090b46a6c6d7e99ec07623adc3fc77a9918b1da 100644
+index 08b819c19eda2ab53b1b37af7a90e38b06b67b85..32d368a18e14f247b4ddcb9d3dc16aa116359be4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1205,6 +1205,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1206,6 +1206,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {

patches/server/0708-Add-various-missing-EntityDropItemEvent-calls.patch

@@ -5,10 +5,10 @@ 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 8062809659eab4f3667e297fc085093d4eb64154..1f40097a3cc2290516edc519313d139ea4ccd3cd 100644
+index 0ab366df0cdd6ccba64e355322ff134cce3b5f42..f030194e160123df6004c2d22f320e33fed00ed3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2673,6 +2673,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2698,6 +2698,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe
  
              entityitem.setDefaultPickUpDelay();
@@ -37,7 +37,7 @@ index dde1ccca98f58200910334160f0f79eb00dd2388..5af4d590a9b0f17ba53c6959d9c18bd1
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 205aefd38a185fa411ff17cfb0155769de8fc2fd..67ea374ae3c66af434b4aadbe702a44d230fbe09 100644
+index 273ca38677223c28025629144c39e9e415145f70..7d9d4df95b5abbe340f813a9cb765e59e2bd6fae 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -492,14 +492,14 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {

patches/server/0709-Fix-Bee-flower-NPE.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Bee flower NPE
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 048a357546c8f5ad5dbb86e2e1ada2730a52d061..42276acfeadec6e7aa9a91d3f446f4fedb04829d 100644
+index a5eab5cdb761e3e9d37ea66287f26a2c3345182d..ca706f1ac5f4248164daa613eef81e46b3e5a210 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -940,7 +940,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -974,7 +974,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
                      Bee.this.dropFlower();
                      this.pollinating = false;
                      Bee.this.remainingCooldownBeforeLocatingNewFlower = 200;

patches/server/0710-More-Teleport-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bc8f9bd50de3894e6262e13ed55252c98f22ed8a..10f7e45f192ef50b9d9bf5fc83a8090efb2b1042 100644
+index 1d2db5c0b1fbd98308659e878832cf7923b9eab0..8bf268094c6034d8b90b0e4d1a5269cce9216cdc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1585,11 +1585,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1639,11 +1639,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              return true; // CraftBukkit - Return event status
          }
  
@@ -113,7 +113,7 @@ index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f43
      private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2df2a194851c170343e2aa3695122618285edc31..7c536fa1155dc87c54489dc145a41a02debda561 100644
+index eb48efa038043dacf539811de9e0f0faa1ec6b42..f9ab43049c7885d6d51a69abb08e961270de17e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1293,13 +1293,94 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0711-Add-EntityPortalReadyEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index c00507fa7af579263caed67dafc2ea9eba09512b..fb361eac03c16ecee02219ff0524cce2292c7976 100644
+index 151025a407a07271bc205955f0ce06f84231563b..ac894e5651ea6145727639e2882edb236a47fb02 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -141,6 +141,14 @@ public class NetherPortalBlock extends Block implements Portal {

patches/server/0712-Don-t-use-level-random-in-entity-constructors.patch

@@ -27,7 +27,7 @@ index 586257fe5c9f5cddd0ed164254f46777c6e71d66..d555fd0b200c012f30ed0c0ec09a37b2
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 45c224198135e48f94dc72312c805bf451bf7b0e..de87483600e55d88176fe25db621bbd3e464729f 100644
+index 1d5de664af21013f68d59b326b1427bc632352de..809f5e847e2f5bb594c130cebd2cb897ea768d82 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -68,7 +68,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {

patches/server/0713-Send-block-entities-after-destroy-prediction.patch

@@ -57,19 +57,19 @@ index 5c3e5c348e6fececccd8097355f423b9e7ad982b..064a7a3e1c4d192010e072a5e985a541
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 10f7e45f192ef50b9d9bf5fc83a8090efb2b1042..51ee01dfe5e144cb881c9376e586b95790a9ab98 100644
+index 8bf268094c6034d8b90b0e4d1a5269cce9216cdc..196026e7f0689270d9c7320109c9f4fbe697f3d0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1724,8 +1724,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1779,8 +1779,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                     return;
+                         return;
-                 }
+                     }
-                 // Paper end - Don't allow digging into unloaded chunks
+                     // Paper end - Don't allow digging into unloaded chunks
 +                // Paper start - Send block entities after destroy prediction
 +                this.player.gameMode.capturedBlockEntity = false;
 +                this.player.gameMode.captureSentBlockEntities = true;
 +                // Paper end - Send block entities after destroy prediction
-                 this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence());
+                     this.player.gameMode.handleBlockBreakAction(blockposition, packetplayinblockdig_enumplayerdigtype, packet.getDirection(), this.player.level().getMaxY(), packet.getSequence());
-                 this.player.connection.ackBlockChangesUpTo(packet.getSequence());
+                     this.player.connection.ackBlockChangesUpTo(packet.getSequence());
 +                // Paper start - Send block entities after destroy prediction
 +                this.player.gameMode.captureSentBlockEntities = false;
 +                // If a block entity was modified speedup the block change ack to avoid the block entity
@@ -86,6 +86,6 @@ index 10f7e45f192ef50b9d9bf5fc83a8090efb2b1042..51ee01dfe5e144cb881c9376e586b957
 +                    }
 +                }
 +                // Paper end - Send block entities after destroy prediction
-                 return;
+                     return;
-             default:
+                 default:
-                 throw new IllegalArgumentException("Invalid player action");
+                     throw new IllegalArgumentException("Invalid player action");

patches/server/0714-Warn-on-plugins-accessing-faraway-chunks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9afc0eaaca5ab7b6445d90ce53e31a6ae76f8848..f0c2187a92de633a1d4cc7e71ff62cbe30ce8774 100644
+index a1731f09e724794be90dbf47e1d463a10cdb3052..447e4c77b5cd90e744e014b66af5f0a9ebe9c2d8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -337,7 +337,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -338,7 +338,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      private static boolean isInWorldBoundsHorizontal(BlockPos pos) {
@@ -18,7 +18,7 @@ index 9afc0eaaca5ab7b6445d90ce53e31a6ae76f8848..f0c2187a92de633a1d4cc7e71ff62cbe
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 33735897ec3800754ba690ca215d3d11d746f728..b0e57ca463a3c7cb1be8920a899c9afc7c871f4b 100644
+index 827cf8b2e241e49dac961b103f32546a04f8a2f9..5379931b2403566f54e4ecf0699229d636d2d38f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -302,9 +302,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {

patches/server/0715-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 7c536fa1155dc87c54489dc145a41a02debda561..84e58dbcbce92784cc6dd197b127736fdd2cc326 100644
+index f9ab43049c7885d6d51a69abb08e961270de17e9..0bbd2c533f2c6f42464c058b1eea86d210cbdf93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -698,6 +698,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0719-Block-Ticking-API.patch

@@ -46,10 +46,10 @@ index 68fcec085334383808b2117a49220f4d8239220b..7afb933782cac7e1ad621e80211c1306
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 0cf033e1b559506bd902a2159adef2b279c18798..d66cab6adc3f76a3863fed5d0d9a6abf765af5c6 100644
+index 78071859e9b745b2497fec7761888b4e65a208a1..fd941d9e38fa6c886b6779eaa63eebe00e1fa1b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-@@ -760,4 +760,11 @@ public class CraftBlockData implements BlockData {
+@@ -761,4 +761,11 @@ public class CraftBlockData implements BlockData {
          return speed;
      }
      // Paper end - destroy speed API

patches/server/0721-Add-NamespacedKey-biome-methods.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2a3dc48aa50b41ede0e1a0e280314624961967f2..d4d5d40ba3bcf715e52aeb72ec4d14718c793e7c 100644
+index d7698f8ae59195458148397406a104224676b76e..088ff124ca82e69e59e02e6604959e399e4aff03 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -598,6 +598,16 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0722-Fix-plugin-loggers-on-server-shutdown.patch

@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d7e5c1a5963139ab0362b565a964c998b2a9691b..0fb8abcead1047c00fa7ee9484d704fc1cb46da7 100644
+index 75ca3bc86c9f70df4ddf29a454b8b2bc251b4b9f..b88a91ff85727109241991f76ebad7c0119ad436 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1276,6 +1276,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -49,7 +49,7 @@ index d7e5c1a5963139ab0362b565a964c998b2a9691b..0fb8abcead1047c00fa7ee9484d704fc
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 29838b7c28409776e124641878def8d6d87630f5..be0d38544395a9b3befb898bb961f34e32fe9509 100644
+index dd2e1ff287ccb86b7ba714604672d2f3d7ef8c61..1c2439ffc1e407ff69286817d22f127470ce07ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -19,6 +19,12 @@ public class Main {

patches/server/0723-Stop-large-look-changes-from-crashing-the-server.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d86f10107e5f580fe96ff6a3cd186ca16d24f3f9..18c56cef30fca0174703e775b3bbbf6df4272585 100644
+index a35ee5cca91512a6b534140fe59df0f8355a097d..2d914f94c7c667ecb934254649d32190c3e1633a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3271,37 +3271,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3282,37 +3282,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
          gameprofilerfiller.pop();
          gameprofilerfiller.push("rangeChecks");
  
@@ -54,10 +54,10 @@ index d86f10107e5f580fe96ff6a3cd186ca16d24f3f9..18c56cef30fca0174703e775b3bbbf6d
          gameprofilerfiller.pop();
          this.animStep += f2;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 01684c903930b14a0df3a146176e2b476a374efb..bf7f81d99af300e89834981eab32568a3747d270 100644
+index f3781e37358f970b56e5b8de77ef224151270f1c..92bf8a3bac1146ed2393faa0f31e219288b466ca 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -428,13 +428,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -413,13 +413,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
      }
  
      protected static float lerpRotation(float prevRot, float newRot) {

patches/server/0724-Fire-EntityChangeBlockEvent-in-more-places.patch

@@ -250,10 +250,10 @@ index 7629b9212ded7155e94f67ca429f62271e5f5aa0..648c2510beb162e73aed236a3169d0bb
              world.gameEvent((Entity) player, (Holder) GameEvent.EAT, pos);
              if (i < 6) {
 diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-index 2bcd246a26dad560cf69682b29983d320ebf1884..05b2eab26e2dc8e143e9fff2dcec40cfe927a197 100644
+index 069535725720520b93dffd44ba1bc434528fd995..b4937f04b4cae1ddff8d6df0f608b2f2e3fb367c 100644
 --- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
-@@ -243,6 +243,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -245,6 +245,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          if (i < 8 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
              if (i < 7 && !world.isClientSide) {
                  BlockState iblockdata1 = ComposterBlock.addItem(player, state, world, pos, stack);
@@ -265,7 +265,7 @@ index 2bcd246a26dad560cf69682b29983d320ebf1884..05b2eab26e2dc8e143e9fff2dcec40cf
  
                  world.levelEvent(1500, pos, state != iblockdata1 ? 1 : 0);
                  player.awardStat(Stats.ITEM_USED.get(stack.getItem()));
-@@ -273,11 +278,16 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -275,11 +280,16 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          if (i < 7 && ComposterBlock.COMPOSTABLES.containsKey(stack.getItem())) {
              // CraftBukkit start
              double rand = world.getRandom().nextDouble();
@@ -284,7 +284,7 @@ index 2bcd246a26dad560cf69682b29983d320ebf1884..05b2eab26e2dc8e143e9fff2dcec40cf
              // CraftBukkit end
  
              stack.shrink(1);
-@@ -318,11 +328,13 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -320,11 +330,13 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          return iblockdata1;
      }
  
@@ -298,7 +298,7 @@ index 2bcd246a26dad560cf69682b29983d320ebf1884..05b2eab26e2dc8e143e9fff2dcec40cf
      static BlockState addItem(@Nullable Entity entity, BlockState iblockdata, LevelAccessor generatoraccess, BlockPos blockposition, ItemStack itemstack, double rand) {
          // CraftBukkit end
          int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
-@@ -333,6 +345,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
+@@ -335,6 +347,11 @@ public class ComposterBlock extends Block implements WorldlyContainerHolder {
          } else {
              int j = i + 1;
              BlockState iblockdata1 = (BlockState) iblockdata.setValue(ComposterBlock.LEVEL, j);
@@ -311,10 +311,10 @@ index 2bcd246a26dad560cf69682b29983d320ebf1884..05b2eab26e2dc8e143e9fff2dcec40cf
              generatoraccess.setBlock(blockposition, iblockdata1, 3);
              generatoraccess.gameEvent((Holder) GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(entity, iblockdata1));
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 8224d5bddb7f7893dee09222a673af54791abcfa..f8828dc8334af19d7b2118e8cf34d94be5e09ee8 100644
+index 801528022c902714138c264bc4d05ef0df85912e..039e42aa243136234009217a5232900d31037de6 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-@@ -260,7 +260,13 @@ public class BeehiveBlockEntity extends BlockEntity {
+@@ -255,7 +255,13 @@ public class BeehiveBlockEntity extends BlockEntity {
                                          --j;
                                      }
  

patches/server/0725-Missing-eating-regain-reason.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Missing eating regain reason
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index bffc7c21727a6e5ff13a498aa51f6797e4d6d596..471d5727b964922d8e898be9e1d5c30f9d3bac97 100644
+index 9a67dfe214d3eb89d1f4371e716df759651ceb1b..989b7be74eaeba7f40eac87c7ee7f252cb0c05c9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -407,7 +407,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
+@@ -406,7 +406,7 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
                          this.usePlayerItem(player, hand, itemstack);
                          FoodProperties foodinfo = (FoodProperties) itemstack.get(DataComponents.FOOD);
  

patches/server/0734-Fix-a-bunch-of-vanilla-bugs.patch

@@ -89,10 +89,10 @@ index 6854ca4d4fec2b4fa541c3fabf63787665572609..e7b444a10b244828827b3c66c5346520
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d090b46a6c6d7e99ec07623adc3fc77a9918b1da..88e3408244f57e9138d7ca7f9b2b90d4f8b66f7e 100644
+index 32d368a18e14f247b4ddcb9d3dc16aa116359be4..03959bd6f40db9fb8f5da83377b8427ed0341f8a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -753,7 +753,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -754,7 +754,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          } else {
              AABB axisalignedbb = AABB.encapsulatingFullBlocks(blockposition1, blockposition1.atY(this.getMaxY() + 1)).inflate(3.0D);
              List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> {
@@ -115,17 +115,17 @@ index 064a7a3e1c4d192010e072a5e985a54135748d87..a706f0855fdf88cc9aece3ba00ef574b
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 51ee01dfe5e144cb881c9376e586b95790a9ab98..f5e05a34afee8f5750b3a7871083968c5d75d2e7 100644
+index 196026e7f0689270d9c7320109c9f4fbe697f3d0..cf8a1ace849eb2c6418861d3dccd393b9b237381 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1832,7 +1832,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1889,7 +1889,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-                                     this.player.swing(enumhand, true);
+                                         this.player.swing(enumhand, true);
+                                     }
                                  }
-                             }
+-                            }
--                        }
 +                        } else { this.player.containerMenu.sendAllDataToRemote(); } // Paper - Fix inventory desync; MC-99075
-                     } else {
+                         } else {
-                         MutableComponent ichatmutablecomponent1 = Component.translatable("build.tooHigh", i).withStyle(ChatFormatting.RED);
+                             MutableComponent ichatmutablecomponent1 = Component.translatable("build.tooHigh", i).withStyle(ChatFormatting.RED);
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index 1456945e8d6e82c59bf09150bfe24bd1ae14a8c3..4b8636c2107e6a16c26f259e0dbdbc40a1268e06 100644
@@ -253,7 +253,7 @@ index 15a1ea01917ce57c2457094186dde937c21ffb22..b0236c7bf9441aa84d3795ffed05dd60
              return 1;
          }
 diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-index cad0b581c992edc5cd312a727695a443e26e96d8..9db647cfbd3f9c884465cf3d3a1b911d46a3da58 100644
+index c257660c79516a5919032b771fc3ac9575e9db9d..5d7f4e4f420c7e0a3467b7ec3859cae2eb63870f 100644
 --- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
 @@ -164,6 +164,11 @@ public class BeaconMenu extends AbstractContainerMenu {
@@ -282,10 +282,10 @@ index 7dd6b7c0ea472cfbc7ece55bc64bc5d85be4a6c0..6dcb571e9f35fbae724be69dc113b0c3
                          entity.clearFire();
                      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 9c1267df7057caa3500c7a9e6c705ea58c2b5e11..4d36aa195332c2ff6fa7bc5fff61ff7dc80a3fd5 100644
+index 7b63e2fd004ae452c7350f0b2d8d7c57a42891ea..5b2c7b8fb780e837d9d735ac86dcac949732ec69 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -531,13 +531,10 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -526,13 +526,10 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
  
      @Override
      public void fillStackedContents(StackedItemContents finder) {
@@ -320,10 +320,10 @@ index 8aab6f68f576fb022eb59798585e264f5aafbc69..edd6017937a7f20a1b43fa15204ec130
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
-index e64a30577e9000e5c4d22fd3d9cf8a9381c5c459..a49f83784f85f5420091692aae588ef067aa5fcd 100644
+index 2f808e5f3a5fb2b63f273f6da47292cfd9719bcc..f4ba1afe2f4dc528fc154258d8bc9e144794980f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
-@@ -101,9 +101,9 @@ public class TrialSpawnerData {
+@@ -100,9 +100,9 @@ public class TrialSpawnerData {
          this.ejectingLootTable = rewardLootTable;
      }
  

patches/server/0735-Remove-unnecessary-onTrackingStart-during-navigation.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 88e3408244f57e9138d7ca7f9b2b90d4f8b66f7e..6db3418d839c0f4cd75ad822e605dc2105c3df53 100644
+index 03959bd6f40db9fb8f5da83377b8427ed0341f8a..ee1b0bb6c6681c32b32ebf50e15e261a123beb1a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2242,7 +2242,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2248,7 +2248,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              }
  
              if (entity instanceof Mob entityinsentient) {
@@ -17,7 +17,7 @@ index 88e3408244f57e9138d7ca7f9b2b90d4f8b66f7e..6db3418d839c0f4cd75ad822e605dc21
                      String s = "onTrackingStart called during navigation iteration";
  
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2322,7 +2322,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2328,7 +2328,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              }
  
              if (entity instanceof Mob entityinsentient) {

patches/server/0737-EntityPickupItemEvent-fixes.patch

@@ -12,10 +12,10 @@ Fires the event when a Raider tries to pick up a raid banner
 to become raid leader.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 15a49e3541c8b45db5e472a64fa0cb94c5a72f67..e04d2c5e75dc774fe893a552474fdb8045c32693 100644
+index 5e64a6b94a510ed618a2542ad03e406a181b63d4..2121d2a2e1aa1d0f0390cc515317096431f6dcb0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -429,7 +429,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -438,7 +438,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
  
      @Override
      protected void pickUpItem(ServerLevel world, ItemEntity itemEntity) {
@@ -56,7 +56,7 @@ index 5c26beef2d3f3d4afa51950ddeb7089989218462..e283b1296c1e831376bfe9491cbf02ed
              if (!flag) {
                  PiglinAi.putInInventory(piglin, itemstack);
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 45375ccdcf730732dd915304dea2f523807eedd6..ab132041982df2a701e4baea8195873f31b4a5fb 100644
+index 6a7d9b59ff4aa2962a88ae8688c06bc67d70dfda..cee1e4db2312efb4843c4b6dc18f4af10b91d304 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -228,6 +228,11 @@ public abstract class Raider extends PatrollingMonster {

patches/server/0739-Add-PlayerInventorySlotChangeEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0f7a07a22ee1db3fd96c06ce7248d9d5392bd14f..046f7f73a6b1673d0736c49b5d0fb09b6eb6d91d 100644
+index 6236f5cbd32e9547bbb1312c322195e440dadc60..f6f1542657a6d96c34523ee3c3ab43586dd65e25 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -381,6 +381,25 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -379,6 +379,25 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
                  }
              }

patches/server/0740-Elder-Guardian-appearance-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 84e58dbcbce92784cc6dd197b127736fdd2cc326..364cca0680da16a3c38749ad7c668263808eff9b 100644
+index 0bbd2c533f2c6f42464c058b1eea86d210cbdf93..38d3daba9715fdc73b59199f0aea09279799a25c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3310,6 +3310,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3295,6 +3295,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  

patches/server/0741-Add-entity-knockback-API.patch

@@ -5,7 +5,7 @@ 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 14b4c3835388d957653ba34444968bb718ce7f68..4fa19ddb1414282020e118eea298d57d2bf42754 100644
+index 2028f9874e96a3b274528858d4149b04a075f256..ed67bf4f30afa9dba604cc406b0a4fbe99dbb2b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1146,4 +1146,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0742-Detect-headless-JREs.patch

@@ -27,10 +27,10 @@ index 68098dfe716e93aafcca4d8d5b5a81d8648b3654..2b7070e0cefa7cf0777df159693750fe
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index cf071610ed662c4a309cc26ee73a74fa490d846f..47cd7c66ac37efebf2f63c49d78dd8fe44a70ef8 100644
+index c551f6827476b6432ebe1d48e7ca5d168df305c5..16322471d83c461098a6ada11e790b9fba7b5ea2 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
-@@ -167,6 +167,18 @@ public class Main {
+@@ -169,6 +169,18 @@ public class Main {
                  return;
              }
  

patches/server/0744-Add-EntityToggleSitEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityToggleSitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-index 749ae54ee42229cb32ec5280bc59a88f74fde197..f6a253e063f4a2cf78a036e44431806a0ba270d9 100644
+index 1c195c928fb5c165981665393424a64004331c93..5bcdeb3eb463d637b16abfb43d5489c0334b6673 100644
 --- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java
 +++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java
-@@ -87,7 +87,7 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
+@@ -90,7 +90,7 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
          }
  
          this.orderedToSit = nbt.getBoolean("Sitting");
@@ -17,7 +17,7 @@ index 749ae54ee42229cb32ec5280bc59a88f74fde197..f6a253e063f4a2cf78a036e44431806a
      }
  
      @Override
-@@ -167,6 +167,12 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
+@@ -174,6 +174,12 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity {
      }
  
      public void setInSittingPose(boolean inSittingPose) {
@@ -31,7 +31,7 @@ index 749ae54ee42229cb32ec5280bc59a88f74fde197..f6a253e063f4a2cf78a036e44431806a
  
          if (inSittingPose) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 67ea374ae3c66af434b4aadbe702a44d230fbe09..a9a8ebb2cebe668628d5bdb33fa1399e0ab1e08b 100644
+index 7d9d4df95b5abbe340f813a9cb765e59e2bd6fae..d48c2bdb004c86e9e08680138fe51dc3b2975a64 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -419,7 +419,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Variant> {

patches/server/0745-Add-fire-tick-delay-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add fire-tick-delay option
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 065d6164b5c9d65d20e7790c607d77e9ad70dfef..0e5a47ab235d99e6cb1468905f791c2c59ac0082 100644
+index bd7835a8b470662b32cc28a4d8f777d4bb8dc60c..4535b514e808fa66318009455c465774b6a139be 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -171,7 +171,7 @@ public class FireBlock extends BaseFireBlock {

patches/server/0749-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1f40097a3cc2290516edc519313d139ea4ccd3cd..44d2c476981bc2c24f89009dcf628ece28fc8e32 100644
+index f030194e160123df6004c2d22f320e33fed00ed3..107bb275b422cde0ff648176aa15573739a2c80b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3321,6 +3321,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3351,6 +3351,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              pluginManager.callEvent(entityCombustEvent);
              if (!entityCombustEvent.isCancelled()) {
                  this.igniteForSeconds(entityCombustEvent.getDuration(), false);

patches/server/0750-Add-PrePlayerAttackEntityEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b8edbd23d547d7189ec64c5d3a8cd1d51859ce23..30e0a5fe3f9bd85d2b702c2c877c5682ed35d461 100644
+index 81e3072ac80623db47ddc0b9c52e0e56dab9e10e..551f7c3750c87527ffc78545c99075221437d1dc 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1222,8 +1222,17 @@ public abstract class Player extends LivingEntity {
+@@ -1225,8 +1225,17 @@ public abstract class Player extends LivingEntity {
      }
  
      public void attack(Entity target) {

patches/server/0752-Add-Player-Warden-Warning-API.patch

@@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 364cca0680da16a3c38749ad7c668263808eff9b..da5f9cbb1c0376ac492cb7a92af79da3ff486c63 100644
+index 38d3daba9715fdc73b59199f0aea09279799a25c..844ff0a4e75f7d2339327d20c6c9b87a354b64ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3315,6 +3315,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3300,6 +3300,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }

patches/server/0753-More-vanilla-friendly-methods-to-update-trades.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] More vanilla friendly methods to update trades
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index f51078e4b9e6267fa43795d009f5d149b86acb5a..a573aa4d387ad3a4e1017890f2b50b83a3c27ff4 100644
+index 27db2878073d1d77813574adfc54d1d686fc7088..af1aee3f6aefaa415601db5fd0bd461b84e68447 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -895,6 +895,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

patches/server/0755-check-global-player-list-where-appropriate.patch

@@ -7,10 +7,10 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6db3418d839c0f4cd75ad822e605dc2105c3df53..77c1ddc6fd14e0b033825909e5c814abd2306f8d 100644
+index ee1b0bb6c6681c32b32ebf50e15e261a123beb1a..334b21a37196f4bf1046d9506c9a491d2662adad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2358,4 +2358,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2364,4 +2364,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              entity.updateDynamicGameEventListener(DynamicGameEventListener::move);
          }
      }
@@ -24,10 +24,10 @@ index 6db3418d839c0f4cd75ad822e605dc2105c3df53..77c1ddc6fd14e0b033825909e5c814ab
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 18c56cef30fca0174703e775b3bbbf6df4272585..d239108bd98fe885eba50a17855f2d62de02c70e 100644
+index 2d914f94c7c667ecb934254649d32190c3e1633a..a69fbbbb38d1222d4e067550fa71a98beb4afb18 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3866,7 +3866,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3877,7 +3877,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void onItemPickup(ItemEntity item) {
@@ -37,7 +37,7 @@ index 18c56cef30fca0174703e775b3bbbf6df4272585..d239108bd98fe885eba50a17855f2d62
          if (entity instanceof ServerPlayer) {
              CriteriaTriggers.THROWN_ITEM_PICKED_UP_BY_ENTITY.trigger((ServerPlayer) entity, item.getItem(), this);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 533cb2eff3d56e7e8a70aba5e1047250e192bf2c..18c19e4b675000aacb74344909fc104964231008 100644
+index a5d13b8bf7d0b6423ef428042e1134f5999cc24b..30bce56a70f923b0ec77c8e3f29e435a71c71510 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -262,7 +262,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -66,7 +66,7 @@ index dac8305f1c897e6f82a2dde67c5b1b6b8b649b19..e185a33b5b1f8e8e0a0e666b24ba3e91
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
-index ea53c25c350c0cf8e0360ea409cd1f69a62054a8..275721d8b3d653b38af505dde30396c0b7b6a3da 100644
+index 4bc3eded897b067e00c8e310c1be603aa7097ac4..84b6d88fdfe2cb8de297ef8a62cf923f004ee397 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java
 @@ -105,6 +105,13 @@ public class SculkShriekerBlockEntity extends BlockEntity implements GameEventLi

patches/server/0757-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/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf69322973a2b5274 100644
+index 679112d1622744680b7d3c7d296acafac019d00a..63872104e7302dbbc9c482a4ed8a9a34710e1eb4 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -693,8 +693,13 @@ public final class ItemStack implements DataComponentHolder {
+@@ -698,8 +698,13 @@ public final class ItemStack implements DataComponentHolder {
      }
  
      public void hurtAndBreak(int amount, ServerLevel world, @Nullable LivingEntity player, Consumer<Item> breakCallback) {  // Paper - Add EntityDamageItemEvent
@@ -29,7 +29,7 @@ index bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf6932297
          // CraftBukkit start
          if (player instanceof final ServerPlayer serverPlayer) { // Paper - Add EntityDamageItemEvent
              PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), j, originalDamage); // Paper - Add EntityDamageItemEvent
-@@ -726,7 +731,12 @@ public final class ItemStack implements DataComponentHolder {
+@@ -731,7 +736,12 @@ public final class ItemStack implements DataComponentHolder {
      }
  
      private int processDurabilityChange(int baseDamage, ServerLevel world, @Nullable LivingEntity player) {  // Paper - Add EntityDamageItemEvent
@@ -43,7 +43,7 @@ index bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf6932297
      }
  
      private void applyDamage(int damage, @Nullable LivingEntity player, Consumer<Item> breakCallback) { // Paper - Add EntityDamageItemEvent
-@@ -766,6 +776,11 @@ public final class ItemStack implements DataComponentHolder {
+@@ -771,6 +781,11 @@ public final class ItemStack implements DataComponentHolder {
      }
  
      public void hurtAndBreak(int amount, LivingEntity entity, EquipmentSlot slot) {
@@ -55,7 +55,7 @@ index bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf6932297
          Level world = entity.level();
  
          if (world instanceof ServerLevel worldserver) {
-@@ -778,8 +793,8 @@ public final class ItemStack implements DataComponentHolder {
+@@ -783,8 +798,8 @@ public final class ItemStack implements DataComponentHolder {
              }
  
              this.hurtAndBreak(amount, worldserver, entity, (item) -> { // Paper - Add EntityDamageItemEvent
@@ -67,7 +67,7 @@ index bcb3a45166e5dd75dd727adf92304b3a75399c8d..90a55f00c36903d52630c51bf6932297
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4fa19ddb1414282020e118eea298d57d2bf42754..1ceaa081231a617bd87331b308c24d9c7a8dcf2b 100644
+index ed67bf4f30afa9dba604cc406b0a4fbe99dbb2b2..ad7f1adab37376814d01398b0fd469cbcc91ab3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1154,4 +1154,48 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0758-Friction-API.patch

@@ -5,10 +5,10 @@ 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 d239108bd98fe885eba50a17855f2d62de02c70e..cd2d6b55b494830797014dbc3cc1f0fbf6518249 100644
+index a69fbbbb38d1222d4e067550fa71a98beb4afb18..b2c94edf9e1161aa97aa56f4124d96bd6a9b42ce 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -296,6 +296,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -294,6 +294,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public boolean bukkitPickUpLoot;
      public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
      public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
@@ -199,7 +199,7 @@ index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d
      public int getHealth() {
          return this.getHandle().health;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 1ceaa081231a617bd87331b308c24d9c7a8dcf2b..2fd4a3068d86a37cc18c9203448823c53d590ffb 100644
+index ad7f1adab37376814d01398b0fd469cbcc91ab3a..8bda60a24c25d7a529f8ef1c70ea2442f76e1bfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1198,4 +1198,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

patches/server/0760-Fix-premature-player-kicks-on-shutdown.patch

@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..2c5cd77103c5a33d4349ab6b9ee2d837
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 4d9f1fc884050993287adfa4578a87da710623fb..a8dfe7a4b3d01bf75587be078f471d1ef1d7a667 100644
+index 72e69f60fb687f102c963b61042b19162a5ec0b2..c12335bc83d31ec65fe2d7cbe0b084748e670010 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -285,6 +285,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -47,7 +47,7 @@ index 4d9f1fc884050993287adfa4578a87da710623fb..a8dfe7a4b3d01bf75587be078f471d1e
                          this.disconnect((Component) Component.translatable("multiplayer.disconnect.server_shutdown"));
                      } catch (ClassCastException classcastexception) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0fb8abcead1047c00fa7ee9484d704fc1cb46da7..3cc43a697ccccac582b72b65bdf6ba08156a0d30 100644
+index b88a91ff85727109241991f76ebad7c0119ad436..0c44f59445e9cd5d2767cbabe874e137b2420a2d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2127,7 +2127,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0761-Sync-offhand-slot-in-menus.patch

@@ -8,10 +8,10 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 046f7f73a6b1673d0736c49b5d0fb09b6eb6d91d..986daea0c055d6015441b22c610e5e29b7ebd2ff 100644
+index f6f1542657a6d96c34523ee3c3ab43586dd65e25..a62e16b88a400c0715ddbdc33d25663303cc9103 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -350,6 +350,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -348,6 +348,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
              }
  

patches/server/0762-Player-Entity-Tracking-Events.patch

@@ -21,10 +21,10 @@ index 2d325c998e40a65af10d6adbb0dc304bea50e3d8..c1c2eeba0f5b8e499cc51cc1df7bf9ac
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 44d2c476981bc2c24f89009dcf628ece28fc8e32..eff6d23c12d65b9c82573a9bbad721baaa1029e3 100644
+index 107bb275b422cde0ff648176aa15573739a2c80b..d484edbf30090d7b2167f2adafd5528bc3d76ccb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4072,7 +4072,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4106,7 +4106,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
      public void startSeenByPlayer(ServerPlayer player) {}
  

patches/server/0764-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 da5f9cbb1c0376ac492cb7a92af79da3ff486c63..3bbb1f29e98a75a5be8ba1777c6f8c088267d599 100644
+index 844ff0a4e75f7d2339327d20c6c9b87a354b64ec..68329d971594ed24438b9398a5a4219a71aed28d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -775,7 +775,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0765-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Improve inlining for some hot BlockBehavior and FluidState
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 83a3c877f2969549ea154ad86687e96fdf34d881..0665ca48fe2f8ab1ce1c0306b11be19b06445f74 100644
+index c3494c5fca138cde1f48e07d8c42ed32254a0d17..7e62dcef2902463c7f67aa20cdb78ea9cf4c44f6 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -969,15 +969,15 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -973,15 +973,15 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.shapeExceedsCube; // Paper - moved into shape cache init
          }
  
@@ -28,7 +28,7 @@ index 83a3c877f2969549ea154ad86687e96fdf34d881..0665ca48fe2f8ab1ce1c0306b11be19b
              return this.isAir;
          }
  
-@@ -1055,7 +1055,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1059,7 +1059,7 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.solidRender;
          }
  
@@ -37,7 +37,7 @@ index 83a3c877f2969549ea154ad86687e96fdf34d881..0665ca48fe2f8ab1ce1c0306b11be19b
              return this.canOcclude;
          }
  
-@@ -1276,11 +1276,11 @@ public abstract class BlockBehaviour implements FeatureElement {
+@@ -1280,11 +1280,11 @@ public abstract class BlockBehaviour implements FeatureElement {
              return this.getBlock().builtInRegistryHolder().is(key);
          }
  

patches/server/0768-Improve-logging-and-errors.patch

@@ -28,7 +28,7 @@ index 2665170b8391a77d6b3fb7ae7b5ccfc0be65acd7..e00d4e0896c0163c43d79af63338de67
  
      private boolean tryInsert(AdvancementHolder advancement) {
 diff --git a/src/main/java/net/minecraft/server/ServerAdvancementManager.java b/src/main/java/net/minecraft/server/ServerAdvancementManager.java
-index 0828deee077a08db8e3fe5c870f9c242b4c550cf..5c8cf225d936617b6c8d265527a19bdfa371a93b 100644
+index 611081844ea18361d0219ab94ba3f5f72c63cf6b..debd90fda75048f5352e7cddaeeb8121ed74b19c 100644
 --- a/src/main/java/net/minecraft/server/ServerAdvancementManager.java
 +++ b/src/main/java/net/minecraft/server/ServerAdvancementManager.java
 @@ -53,6 +53,7 @@ public class ServerAdvancementManager extends SimpleJsonResourceReloadListener<A
@@ -52,10 +52,10 @@ index 4e47611f85f3db6a638d0fc6a0dd712b245cf229..ebe6a002d883721d80cbfcc004064e8a
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f5e05a34afee8f5750b3a7871083968c5d75d2e7..7f1fc7523ff98bf932ffc31035c233f6517e5192 100644
+index cf8a1ace849eb2c6418861d3dccd393b9b237381..739e2c724a1f6170de2298ce2238751f7a6fd05f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3449,7 +3449,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3502,7 +3502,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
  
                      this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                  } catch (ProfilePublicKey.ValidationException profilepublickey_b) {

patches/server/0769-Improve-PortalEvents.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 986daea0c055d6015441b22c610e5e29b7ebd2ff..df2c899988429cb68b0abbb829d378e6a2ed022b 100644
+index a62e16b88a400c0715ddbdc33d25663303cc9103..a5eaac3fb6d949098a9fca20d9dbff59c56773ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1561,7 +1561,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
+@@ -1552,7 +1552,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
  
              Location enter = this.getBukkitEntity().getLocation();
              PositionMoveRotation absolutePosition = PositionMoveRotation.calculateAbsolute(PositionMoveRotation.of(this), PositionMoveRotation.of(teleportTarget), teleportTarget.relatives());
@@ -18,10 +18,10 @@ index 986daea0c055d6015441b22c610e5e29b7ebd2ff..df2c899988429cb68b0abbb829d378e6
              // Paper start - gateway-specific teleport event
              if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) net.minecraft.world.level.block.Blocks.END_GATEWAY)) && this.serverLevel().getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eff6d23c12d65b9c82573a9bbad721baaa1029e3..4135eeab128fc989d9357dee59c779d2812106e8 100644
+index d484edbf30090d7b2167f2adafd5528bc3d76ccb..b3036c121064af76f0d7cd538245a47801a3a738 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3743,7 +3743,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3777,7 +3777,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity();
          Location enter = bukkitEntity.getLocation();
  
@@ -39,7 +39,7 @@ index eff6d23c12d65b9c82573a9bbad721baaa1029e3..4135eeab128fc989d9357dee59c779d2
          if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null || !entity.isAlive()) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
-index bb4800c60ac05f2db8821737b2b884ea99b64799..a7a21f071161fb7e73a046717d2462f871ab653c 100644
+index 58b2454ac5bd3400559aba3c64f228f41f6218ae..af46f2885ead1e3ec1734504d8ba134c886e04fb 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndGatewayBlock.java
 @@ -94,6 +94,10 @@ public class EndGatewayBlock extends BaseEntityBlock implements Portal {
@@ -54,7 +54,7 @@ index bb4800c60ac05f2db8821737b2b884ea99b64799..a7a21f071161fb7e73a046717d2462f8
  
              if (!world.isClientSide && tileentity instanceof TheEndGatewayBlockEntity) {
 diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
-index 6ed6c2123ed4c54f191ed8cf6da72109fb95eb69..4aa14f975e1ceedf3d4a427e0daefb58b12fcafe 100644
+index 8ca226641588a88c8b068a7acac9d7e92b077144..8cb4142562db0be1f1a7d961ec5a10d4abf31692 100644
 --- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
 @@ -71,8 +71,9 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
@@ -78,7 +78,7 @@ index 6ed6c2123ed4c54f191ed8cf6da72109fb95eb69..4aa14f975e1ceedf3d4a427e0daefb58
              boolean flag = resourcekey == Level.END;
              BlockPos blockposition1 = flag ? ServerLevel.END_SPAWN_POINT : worldserver1.getSharedSpawnPos();
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index fb361eac03c16ecee02219ff0524cce2292c7976..2b31bf586c1c0bd393d2aa8d0b6635dd9f22f21c 100644
+index ac894e5651ea6145727639e2882edb236a47fb02..3e9642e5236d9a1cc8e8f3b375d76810f4bc7c6c 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -118,8 +118,9 @@ public class NetherPortalBlock extends Block implements Portal {

patches/server/0771-Add-missing-SpigotConfig-logCommands-check.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 Co-authored-by: david <mrminecraft00@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7f1fc7523ff98bf932ffc31035c233f6517e5192..762382b45afbc18810787858539fba62afc3e84c 100644
+index 739e2c724a1f6170de2298ce2238751f7a6fd05f..838a9c2067503e05ade83e1b7f361880becce994 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2079,7 +2079,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2139,7 +2139,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private void performUnsignedChatCommand(String command) {
          // CraftBukkit start
          String command1 = "/" + command;
@@ -19,7 +19,7 @@ index 7f1fc7523ff98bf932ffc31035c233f6517e5192..762382b45afbc18810787858539fba62
  
          PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(this.getCraftPlayer(), command1, new LazyPlayerSet(this.server));
          this.cserver.getPluginManager().callEvent(event);
-@@ -2119,7 +2121,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2179,7 +2181,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      private void performSignedChatCommand(ServerboundChatCommandSignedPacket packet, LastSeenMessages lastSeenMessages) {
          // CraftBukkit start
          String command = "/" + packet.command();

patches/server/0773-Flying-Fall-Damage.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 30e0a5fe3f9bd85d2b702c2c877c5682ed35d461..aca888c2f02b09ac6739bdc81b194c4527dd69f5 100644
+index 551f7c3750c87527ffc78545c99075221437d1dc..7dd601d0b0efd285a913a074ffa42e142bda8889 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -196,6 +196,7 @@ public abstract class Player extends LivingEntity {
+@@ -199,6 +199,7 @@ public abstract class Player extends LivingEntity {
      private boolean ignoreFallDamageFromCurrentImpulse;
      private int currentImpulseContextResetGraceTime;
      public boolean affectsSpawning = true; // Paper - Affects Spawning API
@@ -16,7 +16,7 @@ index 30e0a5fe3f9bd85d2b702c2c877c5682ed35d461..aca888c2f02b09ac6739bdc81b194c45
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -1651,7 +1652,7 @@ public abstract class Player extends LivingEntity {
+@@ -1654,7 +1655,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -26,7 +26,7 @@ index 30e0a5fe3f9bd85d2b702c2c877c5682ed35d461..aca888c2f02b09ac6739bdc81b194c45
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3bbb1f29e98a75a5be8ba1777c6f8c088267d599..4e37b5c5f95607c368495b0b02a4987d9741b84d 100644
+index 68329d971594ed24438b9398a5a4219a71aed28d..c00cf53b7b7b6d8b1ecd582c49fe82263920f0df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2593,6 +2593,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -47,5 +47,5 @@ index 3bbb1f29e98a75a5be8ba1777c6f8c088267d599..4e37b5c5f95607c368495b0b02a4987d
 +    // Paper end - flying fall damage
 +
      @Override
-     public int getNoDamageTicks() {
+     public void setFlySpeed(float value) {
-         if (this.getHandle().spawnInvulnerableTime > 0) {
+         this.validateSpeed(value);

patches/server/0774-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4135eeab128fc989d9357dee59c779d2812106e8..61bd5290d0056656ab761ecf38cf8c8bbb80ab94 100644
+index b3036c121064af76f0d7cd538245a47801a3a738..bea167afbdd3a2f54b00c3abdb840014313fd239 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -969,6 +969,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -977,6 +977,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public void move(MoverType type, Vec3 movement) {
@@ -17,7 +17,7 @@ index 4135eeab128fc989d9357dee59c779d2812106e8..61bd5290d0056656ab761ecf38cf8c8b
          if (this.noPhysics) {
              this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
          } else {
-@@ -1060,7 +1061,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1071,7 +1072,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                      }
  
                      if (!bl.getType().isAir()) {

patches/server/0775-config-for-disabling-entity-tag-tags.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] config for disabling entity tag tags
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 989b766bc166141a391e0a7c1a5eb815e20acfac..64dc0bd1900575e40ac72a98c6df371223bd244c 100644
+index d62c17c01f39d41d7cd422d37326a66791804090..979c99851ccb363d889069bafa5b5f7eb6b1a436 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -569,6 +569,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -579,6 +579,15 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
  
-         if (minecraftserver != null && entity != null) {
+             if (entity.getType() == entitytypes) {
-             if (world.isClientSide || !entity.onlyOpCanSetNbt() || player != null && minecraftserver.getPlayerList().isOp(player.getGameProfile())) {
+                 if (world.isClientSide || !entity.getType().onlyOpCanSetNbt() || player != null && minecraftserver.getPlayerList().isOp(player.getGameProfile())) {
 +                    // Paper start - filter out protected tags
 +                    if (player == null || !player.getBukkitEntity().hasPermission("minecraft.nbt.place")) {
 +                        nbt = nbt.update((compound) -> {
@@ -21,7 +21,6 @@ index 989b766bc166141a391e0a7c1a5eb815e20acfac..64dc0bd1900575e40ac72a98c6df3712
 +                        });
 +                    }
 +                    // Paper end - filter out protected tags
-+
+                     nbt.loadInto(entity);
-                 nbt.loadInto(entity);
+                 }
              }
-         }

patches/server/0776-Use-single-player-info-update-packet-on-join.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 762382b45afbc18810787858539fba62afc3e84c..66655aecd83138760e5d7601d22b95bb1bf0ec98 100644
+index 838a9c2067503e05ade83e1b7f361880becce994..cd687e9f8a4a1c7785a98d3182639d9b03d7f168 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3487,7 +3487,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3540,7 +3540,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          this.signedMessageDecoder = session.createMessageDecoder(this.player.getUUID());
          this.chatMessageChain.append(() -> {
              this.player.setChatSession(session);

patches/server/0777-Correctly-shrink-items-during-EntityResurrectEvent.patch

@@ -22,10 +22,10 @@ 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 cd2d6b55b494830797014dbc3cc1f0fbf6518249..633c37844062ad93c7241b78663a14a33570c30b 100644
+index b2c94edf9e1161aa97aa56f4124d96bd6a9b42ce..ff583a2c502f700b60cfe4a7fc341744d86f1c32 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1672,7 +1672,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1683,7 +1683,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              this.level().getCraftServer().getPluginManager().callEvent(event);
  
              if (!event.isCancelled()) {

patches/server/0778-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 4e37b5c5f95607c368495b0b02a4987d9741b84d..941efccd54038c2bffbcd89cf3e5a6d1915409fe 100644
+index c00cf53b7b7b6d8b1ecd582c49fe82263920f0df..809b1ead09246281fc09d5cbdaa2ad4432e13978 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1312,6 +1312,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {