[Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
1b5ad2af SPIGOT-6316: PlayerBedLeaveEvent implements Cancellable

CraftBukkit Changes:
058b4df95 SPIGOT-6316: PlayerBedLeaveEvent implements Cancellable

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -3089,7 +3089,7 @@ index 390d79187bc822187d1ba1102c418fa588e8f121..68f1a101174f4a2f7ab5556a5b733f75
          super(entitytypes, world);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1e7f5d77700a1ed98c5f50ea82fb57b5e556496a..09ac187ba8ff52f6fa1f0d5d00a138518bacb50a 100644
+index e01bc3cdbf382cf61add297b871ba8308720508d..03bfd29c12e7dd6e359481ffb56fddad1a44492a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -160,6 +160,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -3101,7 +3101,7 @@ index 1e7f5d77700a1ed98c5f50ea82fb57b5e556496a..09ac187ba8ff52f6fa1f0d5d00a13851
          // CraftBukkit start - fire event
          setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 61b06b81ac135734c9fe271ff87ef1d4fcb9d75b..f388ded80048a695e72dde393992d37f99df6ef9 100644
+index c611a6e7178ec3fe3af29943b9fddc9fb154835d..8ad1256bcde950bc34aeb7f61ef9598f3b1cd2a3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -138,6 +138,7 @@ public abstract class EntityLiving extends Entity {
@@ -3125,10 +3125,10 @@ index efba3b772238cabd5981978bee5d7dc76115f93f..74426693c47b6437a4597ddd1b961aae
          super(entitytypes, world);
          this.f = 5;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5f44def6a5a7d9442a7f494d827e3467ecf953ed..74f5cdd4a73d33f593de86eaa0361c35e54e690d 100644
+index 3da86b5351dc1701d1c54848830e7bb648671978..37a84b44a46e1490f7b79839b04aef012ddc9fa3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -95,6 +95,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -96,6 +96,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public Integer clientViewDistance;
      // CraftBukkit end
  
@@ -3137,7 +3137,7 @@ index 5f44def6a5a7d9442a7f494d827e3467ecf953ed..74f5cdd4a73d33f593de86eaa0361c35
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, worldserver.getSpawn(), worldserver.v(), gameprofile);
          this.spawnDimension = World.OVERWORLD;
-@@ -107,6 +109,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -108,6 +110,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.c(worldserver);
          this.co = minecraftserver.a(this);
  
@@ -3239,7 +3239,7 @@ index b163033a3e15a4fbfdfd8d09cae448675e61c185..eb7282c33dd4f0bb26b9ccafc42bd92e
      IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag);
  
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 035ee010eb0183c3c13cae8d3004960486845493..10b98ba59570ae12797fa29533a6e56701849527 100644
+index d4dcdcb2ca6a75c4927bc104e4b683e7c6ce702d..7d98fe348d6b4a3bc2972217f9a9f0c9d902edbd 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -49,7 +49,7 @@ public final class ItemStack {
@@ -3802,7 +3802,7 @@ index 0000000000000000000000000000000000000000..17d73ebbe51a83f79f338bdb1b366cec
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 514bf059b21b9d74813c4af8d8ee594be1f01eac..99d517fadc279a2ea9b51565d4ef373776af66d4 100644
+index cd260f0cbde31b5127bf3a73b9c946746defc348..472803c2d9292379a36fca681c2ab92ffb01184f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -765,6 +765,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -4501,7 +4501,7 @@ index 5719ef9714e9680596a08c42c33508c16c0e676a..bb0f30f182856d2701fde9b1a65eeb98
          return this.j.m();
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6a8321184068888a9d3a699e5fa357ad3e73ee2c..c54f297e89939fa27c7c39ff6d0110aba537e6ce 100644
+index 170332ce35db120b53f99a45869882236c361960..c96ad91b15920293e228f5eb7d0843beda92faec 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -12,6 +12,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry;

Spigot-Server-Patches/0020-Player-affects-spawning-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 47e1845ca967210d15bf2beba32442ec8b1bde34..a54c0b9c7c0de7c74813717e690cc9aa6cc32b67 100644
+index 0f47b10c9c3357f7a462680e2f26d7808a5f8afc..14646561f8fe661ba2b815c1abfb81af61f027d4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1269,6 +1269,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index 47e1845ca967210d15bf2beba32442ec8b1bde34..a54c0b9c7c0de7c74813717e690cc9aa
          double d3 = this.locX() - d0;
          double d4 = this.locY() - d1;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 8b09f27f805a49085f5a34620a2390bb7eda5f01..4ba524df18fa5e37bb4cee013a024a61a8239453 100644
+index a85daaef5bb7df5abee9670eddec06156ecd0f65..371648709a63b394fb7577722c18d4b9a1738b2b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -70,6 +70,9 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -68,6 +68,9 @@ public abstract class EntityHuman extends EntityLiving {
      private final ItemCooldown bM;
      @Nullable
      public EntityFishingHook hookedFish;
@@ -31,7 +31,7 @@ index 8b09f27f805a49085f5a34620a2390bb7eda5f01..4ba524df18fa5e37bb4cee013a024a61
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index c80d7f72a55ae92587ba8a4618787fb712bdaf23..61b5a3d14413455e22857f72e6b5d825f5b589d8 100644
+index 15b0d48e9dfe707b2859564b33206085f5a4e0db..a819fc46bebc4b1aaae63f822087574e976e2ab8 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -691,7 +691,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -131,7 +131,7 @@ index 90af43930f9141b0c7f51bb3d887d7b9c4d935eb..1741ec5e241f8ae7a3c30a9021d14cb0
  
      public void c() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 04043d3c317fb7fa7b5b03ac5af874f6ffd775a5..7370bde6accd4eac6007f8fccc0933981fb1ed51 100644
+index 4001145980f4dabbd291336d5a464c3856144996..552839adeb031e2346add955a248fdc7725bd577 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1709,7 +1709,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0030-Configurable-end-credits.patch

@@ -20,10 +20,10 @@ index 4bba6977a0287837b8927718c040ac61463f0469..e6e18f309dc09ea9416ea37dcc697ddc
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 74f5cdd4a73d33f593de86eaa0361c35e54e690d..e1bb73282990b685a9d767b3aa9ea16791c15e9a 100644
+index 37a84b44a46e1490f7b79839b04aef012ddc9fa3..46f1a60b7cb7b2e946fe741f0a4d38f104b552a5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -62,7 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      private long ca = SystemUtils.getMonotonicMillis();
      private Entity spectatedEntity;
      public boolean worldChangeInvuln;
@@ -32,7 +32,7 @@ index 74f5cdd4a73d33f593de86eaa0361c35e54e690d..e1bb73282990b685a9d767b3aa9ea167
      private final RecipeBookServer recipeBook = new RecipeBookServer();
      private Vec3D cf;
      private int cg;
-@@ -770,6 +770,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -771,6 +771,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.decouple();
              this.getWorldServer().removePlayer(this);
              if (!this.viewingCredits) {

Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch

@@ -19,10 +19,10 @@ index 4de86b09c6bc3c1974ce61b550ccb73d37f6f170..5a4c3a8c511f22c8c3240c9c7cd83a65
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e1bb73282990b685a9d767b3aa9ea16791c15e9a..a91c4facac9cc1b7c2e497be77af636ac2b36138 100644
+index 46f1a60b7cb7b2e946fe741f0a4d38f104b552a5..46754524a7a4a3087f56ab5460e3dac665c06052 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -80,6 +80,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -81,6 +81,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean e;
      public int ping;
      public boolean viewingCredits;
@@ -30,7 +30,7 @@ index e1bb73282990b685a9d767b3aa9ea16791c15e9a..a91c4facac9cc1b7c2e497be77af636a
  
      // CraftBukkit start
      public String displayName;
-@@ -402,7 +403,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -403,7 +404,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              --this.noDamageTicks;
          }
  

Spigot-Server-Patches/0090-Implement-PlayerLocaleChangeEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a91c4facac9cc1b7c2e497be77af636ac2b36138..bc85a155a6ca0e21ca1dcf737c015e9919748345 100644
+index 46754524a7a4a3087f56ab5460e3dac665c06052..d82643dd24fbd4b35dc526292d6f66234617857f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1543,16 +1543,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1561,16 +1561,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return s;
      }
  
@@ -29,7 +29,7 @@ index a91c4facac9cc1b7c2e497be77af636ac2b36138..bc85a155a6ca0e21ca1dcf737c015e99
          this.locale = packetplayinsettings.locale;
          this.clientViewDistance = packetplayinsettings.viewDistance;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8f352763d81bb44786a603e80feb3a25ce91eb7a..f447059d0eecf68c44a74f27acd726f9355c4bd7 100644
+index a4c4c08ad8fdd03de0b9ac29ff736dd87e6221c6..f4910df73d64d1fc36598982bf20de3607ffd0ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1816,8 +1816,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

@@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4ba524df18fa5e37bb4cee013a024a61a8239453..8e6059e0f6b800e0a141e0274c10b19beb4c58c2 100644
+index 371648709a63b394fb7577722c18d4b9a1738b2b..bc930015082ad6b2c5d744f823d9ad28a07fa5d4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -595,6 +595,12 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -593,6 +593,12 @@ public abstract class EntityHuman extends EntityLiving {
                  return null;
              }
              // CraftBukkit end
@@ -102,7 +102,7 @@ index e6d97e7ffae3eadac586bad078123cd4aaa69916..225353e072033d1e5aaf5604b8db255d
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 030def2da5d3c246dfeb42f12b0148166274fdea..b9107796833f036977dab4e388ce822307985e20 100644
+index 4be09328cea0808c3a41681aea860cd04f799bbd..a4d666480f0211d39e62b82e43100e3d436f4d90 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1059,6 +1059,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0113-Auto-fix-bad-Y-levels-on-player-login.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bc85a155a6ca0e21ca1dcf737c015e9919748345..35a5dbf4356b38ecf2acd699f15a103c3ee0b93c 100644
+index d82643dd24fbd4b35dc526292d6f66234617857f..5de1bd8014a9e89f631d84a7f52332c4693642e9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -208,6 +208,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -209,6 +209,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void loadData(NBTTagCompound nbttagcompound) {
          super.loadData(nbttagcompound);

Spigot-Server-Patches/0117-Cache-user-authenticator-threads.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 35a5dbf4356b38ecf2acd699f15a103c3ee0b93c..279b91d3de42bb7d3a1b99b836a2a6c2873a2077 100644
+index 5de1bd8014a9e89f631d84a7f52332c4693642e9..c2f3b2f72e7f025a69b89e8a52e23160c33a6cc8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -18,7 +18,7 @@ index 35a5dbf4356b38ecf2acd699f15a103c3ee0b93c..279b91d3de42bb7d3a1b99b836a2a6c2
  import java.util.Iterator;
  import java.util.List;
  import java.util.Optional;
-@@ -42,7 +44,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -43,7 +45,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
@@ -27,7 +27,7 @@ index 35a5dbf4356b38ecf2acd699f15a103c3ee0b93c..279b91d3de42bb7d3a1b99b836a2a6c2
      private final AdvancementDataPlayer advancementDataPlayer;
      private final ServerStatisticManager serverStatisticManager;
      private float lastHealthScored = Float.MIN_VALUE;
-@@ -418,13 +420,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -419,13 +421,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          while (!this.removeQueue.isEmpty()) {
              int i = Math.min(this.removeQueue.size(), Integer.MAX_VALUE);
              int[] aint = new int[i];
@@ -50,7 +50,7 @@ index 35a5dbf4356b38ecf2acd699f15a103c3ee0b93c..279b91d3de42bb7d3a1b99b836a2a6c2
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -1410,7 +1419,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1428,7 +1437,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastHealthSent = -1.0F;
          this.lastFoodSent = -1;
          // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit

Spigot-Server-Patches/0129-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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 279b91d3de42bb7d3a1b99b836a2a6c2873a2077..2a4b05e78c1931ee0df36d55bf1accde6eacf623 100644
+index c2f3b2f72e7f025a69b89e8a52e23160c33a6cc8..ba64eb5e8e048a0bb70187efb0cdec17525a3d4a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1913,7 +1913,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1931,7 +1931,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {

Spigot-Server-Patches/0143-Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -26,10 +26,10 @@ index c611b5a63498f5ad1f50a75ccd5d7299e27df7e3..9d1cddc6038f0fd0286e4a32013ae98f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 10c388acaad0cfd6bfffd955a83b29065d591719..f17bd192dc26878ec0979b6812477a96a7f02607 100644
+index bc930015082ad6b2c5d744f823d9ad28a07fa5d4..63f3743bbf3632badf4e66a5ee4239ccbc5df700 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -436,7 +436,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -434,7 +434,7 @@ public abstract class EntityHuman extends EntityLiving {
          this.j(this.getShoulderEntityLeft());
          this.j(this.getShoulderEntityRight());
          if (!this.world.isClientSide && (this.fallDistance > 0.5F || this.isInWater()) || this.abilities.isFlying || this.isSleeping()) {

Spigot-Server-Patches/0152-Shoulder-Entities-Release-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f17bd192dc26878ec0979b6812477a96a7f02607..8b95cb878bd9e294d9c25d1e1c1331f1802118c3 100644
+index 63f3743bbf3632badf4e66a5ee4239ccbc5df700..502154234632fbf65fada993f9a1e457fe8f41cd 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1790,20 +1790,44 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1771,20 +1771,44 @@ public abstract class EntityHuman extends EntityLiving {
  
      }
  

Spigot-Server-Patches/0173-Send-attack-SoundEffects-only-to-players-who-can-see.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ca33de2d305487f0f2f50e14f5878c05e1c9845c..c21d5e87f5ce7f9193d75848bfc89dc294bb8733 100644
+index 502154234632fbf65fada993f9a1e457fe8f41cd..cff46a5d962426912a7a857d8a44348d94223428 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1030,7 +1030,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1028,7 +1028,7 @@ public abstract class EntityHuman extends EntityLiving {
                      int i = b0 + EnchantmentManager.b((EntityLiving) this);
  
                      if (this.isSprinting() && flag) {
@@ -18,7 +18,7 @@ index ca33de2d305487f0f2f50e14f5878c05e1c9845c..c21d5e87f5ce7f9193d75848bfc89dc2
                          ++i;
                          flag1 = true;
                      }
-@@ -1105,7 +1105,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1103,7 +1103,7 @@ public abstract class EntityHuman extends EntityLiving {
                                  }
                              }
  
@@ -27,7 +27,7 @@ index ca33de2d305487f0f2f50e14f5878c05e1c9845c..c21d5e87f5ce7f9193d75848bfc89dc2
                              this.ex();
                          }
  
-@@ -1133,15 +1133,15 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1131,15 +1131,15 @@ public abstract class EntityHuman extends EntityLiving {
                          }
  
                          if (flag2) {
@@ -46,7 +46,7 @@ index ca33de2d305487f0f2f50e14f5878c05e1c9845c..c21d5e87f5ce7f9193d75848bfc89dc2
                              }
                          }
  
-@@ -1193,7 +1193,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1191,7 +1191,7 @@ public abstract class EntityHuman extends EntityLiving {
  
                          this.applyExhaustion(world.spigotConfig.combatExhaustion); // Spigot - Change to use configurable value
                      } else {
@@ -55,7 +55,7 @@ index ca33de2d305487f0f2f50e14f5878c05e1c9845c..c21d5e87f5ce7f9193d75848bfc89dc2
                          if (flag4) {
                              entity.extinguish();
                          }
-@@ -1645,6 +1645,14 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1626,6 +1626,14 @@ public abstract class EntityHuman extends EntityLiving {
      public int getExpToLevel() {
          return this.expLevel >= 30 ? 112 + (this.expLevel - 30) * 9 : (this.expLevel >= 15 ? 37 + (this.expLevel - 15) * 5 : 7 + this.expLevel * 2);
      }

Spigot-Server-Patches/0186-PlayerNaturallySpawnCreaturesEvent.patch

@@ -29,7 +29,7 @@ index dd78f093f6ee9822c4a31d87f3c83d2f8fa4fcf8..b6ec5d0f281bac483f210fd8c45a8965
                  Optional<Chunk> optional = ((Either) playerchunk.a().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2a4b05e78c1931ee0df36d55bf1accde6eacf623..26f81c1af1dda7d0a78ca5815bfaf825ba913efd 100644
+index ba64eb5e8e048a0bb70187efb0cdec17525a3d4a..2fafae87a59b4d5dfab251078d467f8a19b0f620 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1,5 +1,6 @@
@@ -39,7 +39,7 @@ index 2a4b05e78c1931ee0df36d55bf1accde6eacf623..26f81c1af1dda7d0a78ca5815bfaf825
  import com.google.common.collect.Lists;
  import com.mojang.authlib.GameProfile;
  import com.mojang.datafixers.util.Either;
-@@ -97,6 +98,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -98,6 +99,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean sentListPacket = false;
      public Integer clientViewDistance;
      // CraftBukkit end

Spigot-Server-Patches/0193-Toggleable-player-crits-helps-mitigate-hacked-client.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 72f4ca9f98ca84c9a952ff0949a027fb13ffca3c..126fd7cfe50885fb9c3277a69870a9cf5494c326 100644
+index 3c39f1bb3d88baaaed4dd43c51faeef89bb5c6c2..48f0385c7203c7955de5a015f3dc42be2ab7b681 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -192,6 +192,11 @@ public class PaperWorldConfig {
@@ -21,10 +21,10 @@ index 72f4ca9f98ca84c9a952ff0949a027fb13ffca3c..126fd7cfe50885fb9c3277a69870a9cf
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f59bd10fea4d4f7f1d992d6660b230144f0b969f..de913540913f0f7f3971416a9dd6a5f734597ee8 100644
+index cff46a5d962426912a7a857d8a44348d94223428..a4bdedde80eee8bac475854735284826f06fcaef 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1037,6 +1037,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1035,6 +1035,7 @@ public abstract class EntityHuman extends EntityLiving {
  
                      boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround && !this.isClimbing() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && entity instanceof EntityLiving;
  

Spigot-Server-Patches/0199-Player.setPlayerProfile-API.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 04dda158dd42a5e995ed376904e0505b97ffe1c4..7e9a077a6e6af34c06910d1381399eed81f9fc20 100644
+index a4bdedde80eee8bac475854735284826f06fcaef..3df97e5a4a85efa8a77808e58039afc0c7fe073b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -65,7 +65,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -63,7 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
      protected int bG;
      protected final float bH = 0.02F;
      private int g;
@@ -48,7 +48,7 @@ index b8642986f4304b48bf88c4a1d4ddfab1fbae175a..87dcb1688d1bf1221609a410c33a8d61
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2852bb13a7482ca152f8e013142a3efc4645d540..c30743056ccb27267e4aa7413e996720676765a1 100644
+index f21f15e9e6314c0631706f213e53af80df1489ad..bafb362fd62709a29e55ab86475e2c59f1fd36fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1256,8 +1256,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch

@@ -20,10 +20,10 @@ index 48f0385c7203c7955de5a015f3dc42be2ab7b681..cebf1a623a9bec72d60fdd23dda01868
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7a8fec7153bb70b260118d47e7fdd0055009eb76..ac9a5559cff62f49735055afc45ceb75428c69e8 100644
+index 3df97e5a4a85efa8a77808e58039afc0c7fe073b..e56c9ccee76a43898382f6f39133efac6b3721be 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1086,7 +1086,11 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1084,7 +1084,11 @@ public abstract class EntityHuman extends EntityLiving {
                              }
  
                              this.setMot(this.getMot().d(0.6D, 1.0D, 0.6D));

Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch

@@ -7,10 +7,10 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index ac9a5559cff62f49735055afc45ceb75428c69e8..88a23d3e8f251304f22818b8c65590c39c42cd80 100644
+index e56c9ccee76a43898382f6f39133efac6b3721be..a3d9e81eb53aec369c102c1fcf42b50053b4c38e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2051,6 +2051,17 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2032,6 +2032,17 @@ public abstract class EntityHuman extends EntityLiving {
          return ImmutableList.of(EntityPose.STANDING, EntityPose.CROUCHING, EntityPose.SWIMMING);
      }
  
@@ -28,7 +28,7 @@ index ac9a5559cff62f49735055afc45ceb75428c69e8..88a23d3e8f251304f22818b8c65590c3
      @Override
      public ItemStack f(ItemStack itemstack) {
          if (!(itemstack.getItem() instanceof ItemProjectileWeapon)) {
-@@ -2067,7 +2078,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2048,7 +2059,7 @@ public abstract class EntityHuman extends EntityLiving {
                  for (int i = 0; i < this.inventory.getSize(); ++i) {
                      ItemStack itemstack2 = this.inventory.getItem(i);
  

Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0cf43351bd2d1ba00217ee9b37a51dbc5a271f7a..9b5683240478acae516481026cb7802dc5757413 100644
+index a3d9e81eb53aec369c102c1fcf42b50053b4c38e..111ec5443116cbeecc7c9ecee3a585895d8376ec 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1080,7 +1080,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1078,7 +1078,7 @@ public abstract class EntityHuman extends EntityLiving {
                      if (flag5) {
                          if (i > 0) {
                              if (entity instanceof EntityLiving) {
@@ -18,7 +18,7 @@ index 0cf43351bd2d1ba00217ee9b37a51dbc5a271f7a..9b5683240478acae516481026cb7802d
                              } else {
                                  entity.i((double) (-MathHelper.sin(this.yaw * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(this.yaw * 0.017453292F) * (float) i * 0.5F));
                              }
-@@ -1104,7 +1104,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1102,7 +1102,7 @@ public abstract class EntityHuman extends EntityLiving {
                                  if (entityliving != this && entityliving != entity && !this.r(entityliving) && (!(entityliving instanceof EntityArmorStand) || !((EntityArmorStand) entityliving).isMarker()) && this.h((Entity) entityliving) < 9.0D) {
                                      // CraftBukkit start - Only apply knockback if the damage hits
                                      if (entityliving.damageEntity(DamageSource.playerAttack(this).sweep(), f4)) {

Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch

@@ -7,10 +7,10 @@ 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e59d54755542b9053e64618495a3fa79cb084915..6f04a8cf06cf76f433ffcd81d0e41e9b36509948 100644
+index 111ec5443116cbeecc7c9ecee3a585895d8376ec..4eea9bf6efb875cd7ba77958c9d3814237d8c74d 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -155,7 +155,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -153,7 +153,7 @@ public abstract class EntityHuman extends EntityLiving {
          this.et();
          super.tick();
          if (!this.world.isClientSide && this.activeContainer != null && !this.activeContainer.canUse(this)) {
@@ -19,7 +19,7 @@ index e59d54755542b9053e64618495a3fa79cb084915..6f04a8cf06cf76f433ffcd81d0e41e9b
              this.activeContainer = this.defaultContainer;
          }
  
-@@ -350,6 +350,13 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -348,6 +348,13 @@ public abstract class EntityHuman extends EntityLiving {
          return 20;
      }
  
@@ -34,10 +34,10 @@ index e59d54755542b9053e64618495a3fa79cb084915..6f04a8cf06cf76f433ffcd81d0e41e9b
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 26f81c1af1dda7d0a78ca5815bfaf825ba913efd..415f0d74748484db0a211187a74b5d0b51ffe1cd 100644
+index 2fafae87a59b4d5dfab251078d467f8a19b0f620..cadcf029f1b675f9e847d07f2d3eacce8b19ec96 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -415,7 +415,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -416,7 +416,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // Paper end
          if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
@@ -46,7 +46,7 @@ index 26f81c1af1dda7d0a78ca5815bfaf825ba913efd..415f0d74748484db0a211187a74b5d0b
              this.activeContainer = this.defaultContainer;
          }
  
-@@ -589,7 +589,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -590,7 +590,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.activeContainer != this.defaultContainer) {
@@ -55,7 +55,7 @@ index 26f81c1af1dda7d0a78ca5815bfaf825ba913efd..415f0d74748484db0a211187a74b5d0b
          }
  
          String deathMessage = event.getDeathMessage();
-@@ -1142,7 +1142,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1160,7 +1160,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              return OptionalInt.empty();
          } else {
              if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index 26f81c1af1dda7d0a78ca5815bfaf825ba913efd..415f0d74748484db0a211187a74b5d0b
              }
  
              this.nextContainerCounter();
-@@ -1202,7 +1202,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1220,7 +1220,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // CraftBukkit end
          if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index 26f81c1af1dda7d0a78ca5815bfaf825ba913efd..415f0d74748484db0a211187a74b5d0b
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1266,7 +1266,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1284,7 +1284,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void closeInventory() {
@@ -130,7 +130,7 @@ index 02479d398189f0956a6e2a8882f398e33853873e..020cd10518328b81495e44b816446c96
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 78e99f072304fbddec95fed488b4b14743bd1252..46de86d72ddee11026bef01098a5f3f31c6606cc 100644
+index a1491094b58cf814d7b05d6c0ce4067bf34dae1a..a0d1e9f7535db896c0589dc02cb03bda23086167 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1014,7 +1014,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 6f04a8cf06cf76f433ffcd81d0e41e9b36509948..c0b061f588944b2a9a82bea4087c68423c7e22a1 100644
+index 4eea9bf6efb875cd7ba77958c9d3814237d8c74d..80a254039f3efbab6f0cbcf830ab5168fdceb0cc 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2012,6 +2012,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1993,6 +1993,7 @@ public abstract class EntityHuman extends EntityLiving {
          this.datawatcher.set(EntityHuman.bl, nbttagcompound);
      }
  

Spigot-Server-Patches/0279-Improve-death-events.patch

@@ -274,10 +274,10 @@ index 858db1505aa06d85f4e0b522d221f6543ff40f56..352049363d4b7a0302610f7d7cd54c9c
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 74acd6cc97d6b115ff2db220e53081ea9baa7eed..3e7cdc8c1bf9f12598c1364b711001a16c3b9c87 100644
+index cadcf029f1b675f9e847d07f2d3eacce8b19ec96..012856b4dd5a004979d8a5f8521774a404d7d090 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -84,6 +84,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -85,6 +85,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public int ping;
      public boolean viewingCredits;
      private int containerUpdateDelay; // Paper
@@ -288,7 +288,7 @@ index 74acd6cc97d6b115ff2db220e53081ea9baa7eed..3e7cdc8c1bf9f12598c1364b711001a1
  
      // CraftBukkit start
      public String displayName;
-@@ -586,6 +590,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -587,6 +591,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          String deathmessage = defaultMessage.getString();
          org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
@@ -304,7 +304,7 @@ index 74acd6cc97d6b115ff2db220e53081ea9baa7eed..3e7cdc8c1bf9f12598c1364b711001a1
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.activeContainer != this.defaultContainer) {
-@@ -737,8 +750,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -738,8 +751,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                          }
                      }
                  }

Spigot-Server-Patches/0297-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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1e57e53c965a2e9335aa36926c44f7f3aa43af3c..b0f257cb35ff39d9dd6201235dc3ff5db8b85bd7 100644
+index 012856b4dd5a004979d8a5f8521774a404d7d090..8307dd36f772fd575a5a0cbdc7e49aecbd6e29c7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1663,15 +1663,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1681,15 +1681,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
      }
  

Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4923fe299e7f057d5d70d346e83e746185eafdd3..470f8f1440c62b30a9df6cf356003dd35a69ee46 100644
+index c9f4dab524e8f2a80b9e3ee178c36b2e394b5f84..9b8d17aa68bad1a4916681b9eed121011bf3380c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2264,6 +2264,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index 4923fe299e7f057d5d70d346e83e746185eafdd3..470f8f1440c62b30a9df6cf356003dd3
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b0f257cb35ff39d9dd6201235dc3ff5db8b85bd7..4ad9afc9806fc58ef3044371dcd64eb3d86ecf4d 100644
+index 8307dd36f772fd575a5a0cbdc7e49aecbd6e29c7..3530d98ce36e418aa62cc9be3751863af8283339 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -2005,6 +2005,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2023,6 +2023,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.setHealth(this.getMaxHealth());

Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch

@@ -72,10 +72,10 @@ index 9b8d17aa68bad1a4916681b9eed121011bf3380c..031dcd2092800118d4cb12c8bb92b51c
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 502625005f9775ec4cb7200c7e401e44314f6d08..ed544187f27b06c4cd575eff45f5691c8ff7bebd 100644
+index 80a254039f3efbab6f0cbcf830ab5168fdceb0cc..cad21f17dba336bb201d46dce3c13964ccacf65e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -942,9 +942,11 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -940,9 +940,11 @@ public abstract class EntityHuman extends EntityLiving {
          return -0.35D;
      }
  
@@ -112,10 +112,10 @@ index 352049363d4b7a0302610f7d7cd54c9cc6c2a9e0..cade819fe5f7b23b2f4ada721b33ae74
              this.a(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7520a53a0a35762b1632518842cde4568b73f11f..84df78110428ef22fc62759cf55fcb894f902893 100644
+index 3530d98ce36e418aa62cc9be3751863af8283339..054820fb0d105b5d5aaaeea9a0675e3085eb4646 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1110,11 +1110,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1128,11 +1128,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
      }
  

Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -16,10 +16,10 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0925bd03f0be1e8addef7c6ea28537ab34ede6a5..6dab9aec89fa0aa0103bf3f3a63aaf5d52c4b660 100644
+index 054820fb0d105b5d5aaaeea9a0675e3085eb4646..a8802c21c4892717730d71b157c0fcf66d86e47e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -84,6 +84,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -85,6 +85,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public int ping;
      public boolean viewingCredits;
      private int containerUpdateDelay; // Paper
@@ -106,7 +106,7 @@ index 00333548b470435aa89fb0f4b29047eb1461e992..5770d4183c1b9ab6119a25930283c023
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ef8396415cae1de269414e134d5fd02b43f3b729..08512916fd14e3795d021f4b4c9212e4d6efaed2 100644
+index 2a243970e629dae83a223ad995f587361f91451f..058b57af2d50e82a877c87cc29c4dfb55685d0a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -142,6 +142,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0320-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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6dab9aec89fa0aa0103bf3f3a63aaf5d52c4b660..1de7b182d40670b79887facdf502d6033c4ae697 100644
+index a8802c21c4892717730d71b157c0fcf66d86e47e..07fbda110ed1a4f0286fe6352dbe90d54ee680ec 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1376,6 +1376,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1394,6 +1394,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void p() {
          this.ch = true;
          this.ejectPassengers();

Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch

@@ -8,10 +8,10 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1de7b182d40670b79887facdf502d6033c4ae697..a511a357dc9ef6f3012195603ae54d24e4a8d1fd 100644
+index 07fbda110ed1a4f0286fe6352dbe90d54ee680ec..d34cbba632c8847fe40cf68acf4ec204cde8c2bc 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -563,6 +563,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -564,6 +564,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          });
      }
  
@@ -58,7 +58,7 @@ index 1de7b182d40670b79887facdf502d6033c4ae697..a511a357dc9ef6f3012195603ae54d24
      @Override
      public void die(DamageSource damagesource) {
          boolean flag = this.world.getGameRules().getBoolean(GameRules.SHOW_DEATH_MESSAGES);
-@@ -652,7 +692,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -653,7 +693,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.dropExperience();
          // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
          if (!event.getKeepInventory()) {

Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch

@@ -573,10 +573,10 @@ index 2eb38bfcdc0c232da9dad6921df503e5a11de09f..2fad6a79ee977c2712c55433bde8eca5
  
              this.p = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a511a357dc9ef6f3012195603ae54d24e4a8d1fd..e3f271a82f188f16ec249148fb4fb2af746d20ae 100644
+index d34cbba632c8847fe40cf68acf4ec204cde8c2bc..e14875420dda139799ceabdddde4ade9705b1d02 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -89,6 +89,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -90,6 +90,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
      // Paper end
@@ -588,7 +588,7 @@ index a511a357dc9ef6f3012195603ae54d24e4a8d1fd..e3f271a82f188f16ec249148fb4fb2af
  
      // CraftBukkit start
      public String displayName;
-@@ -125,6 +130,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -126,6 +131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.displayName = this.getName();
          this.canPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
@@ -596,7 +596,7 @@ index a511a357dc9ef6f3012195603ae54d24e4a8d1fd..e3f271a82f188f16ec249148fb4fb2af
      }
  
      // Yes, this doesn't match Vanilla, but it's the best we can do for now.
-@@ -1904,6 +1910,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1922,6 +1928,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  

Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e3f271a82f188f16ec249148fb4fb2af746d20ae..c5f9e6beb06219fe4d085e6c5adb0a4e4c934740 100644
+index e14875420dda139799ceabdddde4ade9705b1d02..fe62dee53155cfaf9e1c44479911a32dbc584e32 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -946,6 +946,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -947,6 +947,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  this.lastHealthSent = -1.0F;
                  this.lastFoodSent = -1;
  

Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c5f9e6beb06219fe4d085e6c5adb0a4e4c934740..43bc279106e8097c345a4c959d65db6fdad16939 100644
+index fe62dee53155cfaf9e1c44479911a32dbc584e32..f82255227f3a9470737d381be8f7a22216dc8f27 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -695,7 +695,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -696,7 +696,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.eW();
          }
          // SPIGOT-5478 must be called manually now

Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch

@@ -36,10 +36,10 @@ index 525d702d78a609af987ebd2c32169b873e5c05ed..6c8e9d498c9a30a1aa88494ba09c3cae
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 43bc279106e8097c345a4c959d65db6fdad16939..19ef065f97b0e01cafde2cff9d0b0874030a8a24 100644
+index f82255227f3a9470737d381be8f7a22216dc8f27..46dad293f19e84e30a32522591c3b8edf8e3a4dd 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -85,6 +85,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -86,6 +86,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean viewingCredits;
      private int containerUpdateDelay; // Paper
      public long loginTime; // Paper

Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch

@@ -7,10 +7,10 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 19ef065f97b0e01cafde2cff9d0b0874030a8a24..9b13be3be5c911a00f2278f05557795cd916054d 100644
+index 46dad293f19e84e30a32522591c3b8edf8e3a4dd..d4c6d26a61bf3519333cb99f04f28afaf4764cac 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -476,7 +476,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -477,7 +477,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void playerTick() {
          try {

Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch

@@ -7,10 +7,10 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 21bace17c7cac0b895ac1ab16ae43bb207a725ab..7c0d381926e5ce59ded474c65b50016d4a7feab1 100644
+index cad21f17dba336bb201d46dce3c13964ccacf65e..5a7475c2ce72f1a77ae757ee5c77ab4983a150f7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -952,7 +952,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -950,7 +950,7 @@ public abstract class EntityHuman extends EntityLiving {
  
      @Override
      protected boolean isFrozen() {

Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch

@@ -10,10 +10,10 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9b13be3be5c911a00f2278f05557795cd916054d..dde0e9f1911d34791c7d7396f82cff5f82eec253 100644
+index d4c6d26a61bf3519333cb99f04f28afaf4764cac..67eaac661a03742051e63551e6f18e1475a19e99 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -122,7 +122,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -123,7 +123,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.serverStatisticManager = minecraftserver.getPlayerList().getStatisticManager(this);
          this.advancementDataPlayer = minecraftserver.getPlayerList().f(this);
          this.G = 1.0F;
@@ -22,7 +22,7 @@ index 9b13be3be5c911a00f2278f05557795cd916054d..dde0e9f1911d34791c7d7396f82cff5f
          this.co = minecraftserver.a(this);
  
          this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
-@@ -173,6 +173,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -174,6 +174,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
      // CraftBukkit end
  
@@ -30,7 +30,7 @@ index 9b13be3be5c911a00f2278f05557795cd916054d..dde0e9f1911d34791c7d7396f82cff5f
      private void c(WorldServer worldserver) {
          BlockPosition blockposition = worldserver.getSpawn();
  
-@@ -350,7 +351,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -351,7 +352,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  position = Vec3D.a(((WorldServer) world).getSpawn());
              }
              this.world = world;

Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index dde0e9f1911d34791c7d7396f82cff5f82eec253..5a7a065fdf49c0cfa49afb6c78da7cca81eff708 100644
+index 67eaac661a03742051e63551e6f18e1475a19e99..18f50189032b710dbdd4e81b079b57b48db49630 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -427,7 +427,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -428,7 +428,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              containerUpdateDelay = world.paperConfig.containerUpdateTickRate;
          }
          // Paper end
@@ -17,7 +17,7 @@ index dde0e9f1911d34791c7d7396f82cff5f82eec253..5a7a065fdf49c0cfa49afb6c78da7cca
              this.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
              this.activeContainer = this.defaultContainer;
          }
-@@ -1255,7 +1255,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1273,7 +1273,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              } else {
                  // CraftBukkit start
                  this.activeContainer = container;
@@ -26,7 +26,7 @@ index dde0e9f1911d34791c7d7396f82cff5f82eec253..5a7a065fdf49c0cfa49afb6c78da7cca
                  // CraftBukkit end
                  container.addSlotListener(this);
                  return OptionalInt.of(this.containerCounter);
-@@ -2051,7 +2051,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2069,7 +2069,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      @Override

Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch

@@ -85,10 +85,10 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7c0d381926e5ce59ded474c65b50016d4a7feab1..caaa01b20e5b7430b809477022f8ab35f3c5bf20 100644
+index 5a7475c2ce72f1a77ae757ee5c77ab4983a150f7..59b00c78f8d92bcceca35d0f25e4d94b3ebdc6e2 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -36,7 +36,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -34,7 +34,7 @@ public abstract class EntityHuman extends EntityLiving {
      private static final Map<EntityPose, EntitySize> b = ImmutableMap.<EntityPose, EntitySize>builder().put(EntityPose.STANDING, EntityHuman.bh).put(EntityPose.SLEEPING, EntityHuman.ah).put(EntityPose.FALL_FLYING, EntitySize.b(0.6F, 0.6F)).put(EntityPose.SWIMMING, EntitySize.b(0.6F, 0.6F)).put(EntityPose.SPIN_ATTACK, EntitySize.b(0.6F, 0.6F)).put(EntityPose.CROUCHING, EntitySize.b(0.6F, 1.5F)).put(EntityPose.DYING, EntitySize.c(0.2F, 0.2F)).build();
      private static final DataWatcherObject<Float> c = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.c);
      private static final DataWatcherObject<Integer> d = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.b);
@@ -98,7 +98,7 @@ index 7c0d381926e5ce59ded474c65b50016d4a7feab1..caaa01b20e5b7430b809477022f8ab35
      protected static final DataWatcherObject<NBTTagCompound> bk = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
      protected static final DataWatcherObject<NBTTagCompound> bl = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5a7a065fdf49c0cfa49afb6c78da7cca81eff708..e07e2f06e47ed74c761d6353d5f59706971f3fb7 100644
+index 18f50189032b710dbdd4e81b079b57b48db49630..caccc482bb230cc6c64a9ef9cd3e8549e3de3212 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -109,7 +109,7 @@ index 5a7a065fdf49c0cfa49afb6c78da7cca81eff708..e07e2f06e47ed74c761d6353d5f59706
  import com.mojang.authlib.GameProfile;
  import com.mojang.datafixers.util.Either;
  import com.mojang.serialization.DataResult;
-@@ -60,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -61,7 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public int lastSentExp = -99999999;
      public int invulnerableTicks = 60;
      private EnumChatVisibility bY;
@@ -118,7 +118,7 @@ index 5a7a065fdf49c0cfa49afb6c78da7cca81eff708..e07e2f06e47ed74c761d6353d5f59706
      private long ca = SystemUtils.getMonotonicMillis();
      private Entity spectatedEntity;
      public boolean worldChangeInvuln;
-@@ -1656,6 +1657,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1674,6 +1675,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public String locale = null; // CraftBukkit - lowercase // Paper - default to null
      public void a(PacketPlayInSettings packetplayinsettings) {
@@ -149,7 +149,7 @@ index dbc3552d50c4129e1844c8a379ab5ba396645f52..87ec3987d4b6de836016e91ef90383e3
          return this.e;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1eaf0a0303e6d687d9626d1ffcca41d9169341a8..708636e9ce98a8e83ffb3854e14912d135a58c1d 100644
+index 99453d8a0270a8c6acfc912b9a654f5dd312b41b..e28309cefff2b2c1c5c1c200a67c3d1ca3cc65b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,8 @@

Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch

@@ -28,10 +28,10 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e07e2f06e47ed74c761d6353d5f59706971f3fb7..b8d8368a18acca06be58c2e146d440cfffab2de9 100644
+index caccc482bb230cc6c64a9ef9cd3e8549e3de3212..c2682a4c654ef788439c6d9fc8bfa841ed61fecf 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -108,6 +108,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -109,6 +109,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public double maxHealthCache;
      public boolean joining = true;
      public boolean sentListPacket = false;
@@ -40,7 +40,7 @@ index e07e2f06e47ed74c761d6353d5f59706971f3fb7..b8d8368a18acca06be58c2e146d440cf
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 842f5ebad2a4d040b9912ec4841de426667cd91d..c2abf8dca89f3a4f3671e21b2cbfe9c7ad130725 100644
+index 33e0a93917e67860704e08e639cca1dbdf3b2708..de9355914ec1dd4f2e5c3a9d9de881c9df9002ce 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1538,6 +1538,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch

@@ -18,7 +18,7 @@ index f7355ca6d75c783b663b027efc2ccf6c07e6191d..6bcca8f1ddfd4886b6795a1856ec196e
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2762215b2cdbeb2ea77dbd1dccecaa770a5b94c8..dc9b371af6c21510e9efba31ad462968aab49153 100644
+index 3dc33c26150af672df19e3f78572e74ce65bdc79..9fa4425dc0e308f3cce06cb8ca5b02a08e505176 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1283,7 +1283,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,10 +31,10 @@ index 2762215b2cdbeb2ea77dbd1dccecaa770a5b94c8..dc9b371af6c21510e9efba31ad462968
  
      public void d(Vec3D vec3d) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b8d8368a18acca06be58c2e146d440cfffab2de9..b307fca8c4b91f0bf260497bc425f2f10540e36d 100644
+index c2682a4c654ef788439c6d9fc8bfa841ed61fecf..8a6f9c8629635fe6015ac65348b54bd37683f46e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -44,6 +44,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -45,6 +45,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger LOGGER = LogManager.getLogger();
      public PlayerConnection playerConnection;
@@ -42,7 +42,7 @@ index b8d8368a18acca06be58c2e146d440cfffab2de9..b307fca8c4b91f0bf260497bc425f2f1
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
      public final Deque<Integer> removeQueue = new ArrayDeque<>(); // Paper
-@@ -109,6 +110,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -110,6 +111,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean joining = true;
      public boolean sentListPacket = false;
      public boolean supressTrackerForLogin = false; // Paper

Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch

@@ -148,10 +148,10 @@ index 6bcca8f1ddfd4886b6795a1856ec196e8aa61299..dfd85fc1573338e333831e96d3d8845a
                              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b307fca8c4b91f0bf260497bc425f2f10540e36d..38b80b72a583b5d99ad9768d41a4ecfb504fb5f2 100644
+index 8a6f9c8629635fe6015ac65348b54bd37683f46e..39eca5ff11e4070c80a276eff25843bba812cd2b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -117,6 +117,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -118,6 +118,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> cachedSingleHashSet; // Paper
  

Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch

@@ -124,10 +124,10 @@ index ef61f8e784b7ebd26293d627e8b8e1aef1be6e21..03b1a67aaf3ed75b7669a3157847affd
                  if (flag1) {
                      ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 38b80b72a583b5d99ad9768d41a4ecfb504fb5f2..59554edff841a09e74465ff1101d09d049ea9b7e 100644
+index 39eca5ff11e4070c80a276eff25843bba812cd2b..debb189f7087ce9351ed9055cf1eff911816851b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -119,6 +119,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -120,6 +120,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
  
@@ -627,7 +627,7 @@ index a50b647631eae271380728c890ad3ff67f56bcbe..8198962c05fe83fd2ff0401c35f4976e
  
              if ((i & 1) != 0) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e800c7cdfa2a9d5ee8e3969ed14e7453e82d9450..b2a225088753a38a3119b4db1d99de8c4529c175 100644
+index 8f221c3b4c4cc9b5dea9938d868a2a036854d6e3..48dc8ed1294ac53216d7014b0b3130acb8e5b328 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2535,10 +2535,39 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch

@@ -569,10 +569,10 @@ index dfd85fc1573338e333831e96d3d8845a21d48224..35ac03c099f525c7cebe0d90ad2c665f
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 59554edff841a09e74465ff1101d09d049ea9b7e..66920fa15720976a84a33ce498b8ca6f5ad5dee3 100644
+index debb189f7087ce9351ed9055cf1eff911816851b..804ac31e83e40a532999d546eaac0aae3642ec28 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -56,6 +56,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -57,6 +57,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      private int lastArmorScored = Integer.MIN_VALUE;
      private int lastExpLevelScored = Integer.MIN_VALUE;
      private int lastExpTotalScored = Integer.MIN_VALUE;
@@ -585,7 +585,7 @@ index 59554edff841a09e74465ff1101d09d049ea9b7e..66920fa15720976a84a33ce498b8ca6f
      private float lastHealthSent = -1.0E8F;
      private int lastFoodSent = -99999999;
      private boolean lastSentSaturationZero = true;
-@@ -141,6 +147,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -142,6 +148,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
      }
@@ -607,7 +607,7 @@ index 59554edff841a09e74465ff1101d09d049ea9b7e..66920fa15720976a84a33ce498b8ca6f
  
      // Yes, this doesn't match Vanilla, but it's the best we can do for now.
      // If this is an issue, PRs are welcome
-@@ -488,6 +509,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -489,6 +510,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              if (valid && !this.isSpectator() || this.world.isLoaded(this.getChunkCoordinates())) { // Paper - don't tick dead players that are not in the world currently (pending respawn)
                  super.tick();
              }
@@ -1222,7 +1222,7 @@ index d7b9d9fd3a3b607278a3d72b0b306b0be2aa30ad..6fd852db6bcfbfbf84ec2acf6d23b08a
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b2a225088753a38a3119b4db1d99de8c4529c175..9cdef96fe912b14be02f10c9b16464d987085f76 100644
+index 48dc8ed1294ac53216d7014b0b3130acb8e5b328..560590c3c772eb91d562c622b627af36bf394609 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2525,6 +2525,10 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0540-Incremental-player-saving.patch

@@ -25,10 +25,10 @@ index fd3b4a01c84da110d41b7224ebb38ae78b389f79..deb77934dcba8c9209c942a6521dd848
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 66920fa15720976a84a33ce498b8ca6f5ad5dee3..59d47a9f75450573b26b82b6f432af7bdc46a783 100644
+index 804ac31e83e40a532999d546eaac0aae3642ec28..f09c1367f375dc6930fb95ec8f216c6c421a34ea 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -43,6 +43,7 @@ import org.bukkit.inventory.MainHand;
+@@ -44,6 +44,7 @@ import org.bukkit.inventory.MainHand;
  public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger LOGGER = LogManager.getLogger();
@@ -37,7 +37,7 @@ index 66920fa15720976a84a33ce498b8ca6f5ad5dee3..59d47a9f75450573b26b82b6f432af7b
      public NetworkManager networkManager; // Paper
      public final MinecraftServer server;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 820c680f1039f747797a758cece5014f3159e508..84b304b4998f682688be26b9402da8eed8c265a8 100644
+index ca417825eb0827caad817f65b5132f1de37e3679..69fcfff3f21168f334fd526cb65e63e086d32a70 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1226,9 +1226,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 59d47a9f75450573b26b82b6f432af7bdc46a783..976c44c8eeecc513fa11de55b80317550f621407 100644
+index f09c1367f375dc6930fb95ec8f216c6c421a34ea..7b0cbeaf9974da60c0f93ea779cc6f2301754d48 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -127,6 +127,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -128,6 +128,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
  
      boolean needsChunkCenterUpdate; // Paper - no-tick view distance
@@ -17,7 +17,7 @@ index 59d47a9f75450573b26b82b6f432af7bdc46a783..976c44c8eeecc513fa11de55b8031755
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, worldserver.getSpawn(), worldserver.v(), gameprofile);
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 7a84ea4116be070ab878e55b0cd919f3f3688f30..3ec8ba17ddf376aa98e2b74979b2544922712560 100644
+index fc4ad72ffaed5e747cfecc71e9ac8ee2b556ce31..fb1e3c705b8abee13695762cdfd0e9f1bfdb5ad8 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -119,12 +119,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -37,7 +37,7 @@ index 7a84ea4116be070ab878e55b0cd919f3f3688f30..3ec8ba17ddf376aa98e2b74979b25449
                          NetworkManager.LOGGER.debug("Failed to sent packet", throwable);
                          this.sendPacket(new PacketPlayOutKickDisconnect(chatmessage), (future) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c1ce4d39e59d0e49996169dc9c26e8ccafde6e3e..0aac84e9800788947bb75b04307ba6fffb57dab8 100644
+index 9fd9d81b1d875c4f465f8fb509b35da49695d4c8..4bff738485fc828db147d57e8b6247bced46cc4b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -298,6 +298,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 976c44c8eeecc513fa11de55b80317550f621407..7240b885d96eb2df187b6229449af1a893a4524e 100644
+index 7b0cbeaf9974da60c0f93ea779cc6f2301754d48..07808a111047934d8ca10c45b7e702f7a7115788 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -16,6 +16,8 @@ import java.util.OptionalInt;
@@ -17,7 +17,7 @@ index 976c44c8eeecc513fa11de55b80317550f621407..7240b885d96eb2df187b6229449af1a8
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
-@@ -1938,11 +1940,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1956,11 +1958,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void a(ChunkCoordIntPair chunkcoordintpair, Packet<?> packet, Packet<?> packet1) {
          this.playerConnection.sendPacket(packet1);
          this.playerConnection.sendPacket(packet);

Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 04d505c7a19775d0353c10424a84a1ce8885dc2c..baa82134d1f56a4d370db3012207e0f2b2fcd9ed 100644
+index 07808a111047934d8ca10c45b7e702f7a7115788..a9a409eebabae11ab84cf9bcced1f9a030b4a479 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -989,6 +989,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -990,6 +990,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  this.world.getServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
              }

work/Bukkit

@@ -1 +1 @@
-Subproject commit e70a125f4f4fe1c22d8d225dfa606155e7348ac9
+Subproject commit 1b5ad2af5decf1d2cd276ae391d75a8ab1167b15

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 08de4679f03b406714cdb4308566804a17abfb48
+Subproject commit 058b4df95a293166201eaaadcbebf4ce9083d349