Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears 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:
42d5a714 SPIGOT-5899: Hoglins API similar to Piglins
2c1ee10e SPIGOT-5887: ClickType doesn't include off hand swaps
5ff7c7ce SPIGOT-5886: Missing BlockData

CraftBukkit Changes:
7560f5f5 SPIGOT-5905: Fix hex colours not being allowed in MOTD
d47c47ee SPIGOT-5889: Villager using composter should call EntityChangeBlockEvent
2fe6b4a3 SPIGOT-5899: Hoglins API similar to Piglins
e09dbeca SPIGOT-5887: ClickType doesn't include off hand swaps
23aac2a5 SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously
92cbf656 SPIGOT-5884: Tab completions lost on reloadData / minecraft:reload
fb4e54ad SPIGOT-5902: PlayerRespawnEvent places player at spawn before event is called
aa8f3d5a SPIGOT-5901: Structures are generated in all worlds based on the setting for the main world
a0c35937 SPIGOT-5895: PlayerChangedWorldEvent#getFrom is incorrect
89c0a5c3 SPIGOT-5886: Missing BlockData

Spigot Changes:
0287a20d SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously

Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make /plugins list alphabetical
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index 23a8a8616756f417c11dd28e63e27c5c4df383c0..6b21089cd4a09c3c49caf19f1b70f7a50dba3995 100644
+index e8a7f435fb30da3506b2b4fa8c5675c829edc105..4a75997f93f5c33f19200994562aaff99bdd422f 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 @@ -3,6 +3,9 @@ package org.bukkit.command.defaults;

Spigot-API-Patches/0118-Add-an-asterisk-to-legacy-API-plugins.patch

@@ -23,7 +23,7 @@ index 1b6d737046646c102b0d519ab3f67c3fbd503979..541e28a9bece0beb0c2cf02c39030840
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
-index 6b21089cd4a09c3c49caf19f1b70f7a50dba3995..ae07c88937da014d711e219b07e7d4b767f24ba5 100644
+index 4a75997f93f5c33f19200994562aaff99bdd422f..665211cb1bb27d228a43342ebca0f60e0b7f6c4b 100644
 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
 @@ -74,7 +74,13 @@ public class PluginsCommand extends BukkitCommand {

Spigot-Server-Patches/0002-Paper-config-files.patch

@@ -575,7 +575,7 @@ index 27e6872c675647d7e61040b76183dac4e347a40c..aa68eb71b131c1d529ded6c651621cfa
          this.setPVP(dedicatedserverproperties.pvp);
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ede38b7b5fe4acc29ae9c12298a73a3a745983ac..781eaaa4544dfa6e2c523d4d3d99929e7ab46ac7 100644
+index 4ee11b6fbbb49b1f52fe2cf64f77c1bdd2fd3907..51499ef45faa2bba5f180ee333c09af73d3b708e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -636,7 +636,7 @@ index d5e1da2eeea7c06289f52509af844df59e8a29b2..63d3d43f74bed94cd03aa3b7254e6630
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c02d8ae1c198492daf1a0fc82badaaf942766902..e34031d0afa6918ce70150531c7a5c5097bf23d9 100644
+index 2c23fb72d3965f2c35c12b3d130725644d389ca0..38d6a46ec51c12983d229d962eb7dc3701ce13fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -801,6 +801,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0003-MC-Dev-fixes.patch

@@ -279,19 +279,6 @@ index 771841e08591955e61c7bcc5b09c8457652c1b9c..8162c11d14b8e88c2b572f9ddf6b7a15
              String s1 = ((INamable) t0).getName();
  
              if (this.b.containsKey(s1)) {
-diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index 026c51b5ce80ff4161d2f126e8df9dc493a46957..fb3ddcc5d5a1154a7e0583135ecd541e8f67ff0b 100644
---- a/src/main/java/net/minecraft/server/ChunkStatus.java
-+++ b/src/main/java/net/minecraft/server/ChunkStatus.java
-@@ -90,7 +90,7 @@ public class ChunkStatus {
-         return (CompletableFuture) function.apply(ichunkaccess);
-     });
-     private static final List<ChunkStatus> q = ImmutableList.of(ChunkStatus.FULL, ChunkStatus.FEATURES, ChunkStatus.LIQUID_CARVERS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS, ChunkStatus.STRUCTURE_STARTS);
--    private static final IntList r = (IntList) SystemUtils.a((Object) (new IntArrayList(a().size())), (intarraylist) -> {
-+    private static final IntList r = (IntList) SystemUtils.a((new IntArrayList(a().size())), (java.util.function.Consumer<IntArrayList>)(IntArrayList intarraylist) -> { // Paper - decompile fix
-         int i = 0;
- 
-         for (int j = a().size() - 1; j >= 0; --j) {
 diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java
 index fbb708f5f7e4d2da9d96b595498da436b088a408..f27c7041cdc2f062f0abb222b02026194ab33c60 100644
 --- a/src/main/java/net/minecraft/server/CraftingManager.java
@@ -527,7 +514,7 @@ index 998101592723abb26c91d1f92e98be1cf24c954d..ee9069c744df63cbb7f21dd9d28d6d55
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1360385091332ddf032b075990e59eee5543feb1..bae5ddbd97bd3f3422c699c42f025337b7cef574 100644
+index ea3685df509101f3fed8b07088baef3ffdb4b85a..5e2dff9a30615b5580710f872a92ab9f07fca6cf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1549,9 +1549,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -3065,7 +3065,7 @@ index 8856981da86219bdb036aa6246152f382ff8a818..4c6979903d287f7f37d9029f6ce25517
          this.a();
          packetdataserializer.writeByte(this.i);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 781eaaa4544dfa6e2c523d4d3d99929e7ab46ac7..0622f0d8d765c1249fd97f27c3c83af519f01c00 100644
+index 51499ef45faa2bba5f180ee333c09af73d3b708e..9da321fc0e02e4a2e47f515011df33714affd368 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -983,8 +983,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -3138,7 +3138,7 @@ index fb0f281261455c9f127abd8d3b336135ad84fc27..ebdd990829edb8e423f482fa4352fe2d
          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 a356e3258a69e059fd752212d3c5f13078ed62ab..183346d37e36be70348ecf0f2f26a0e0ef35eab8 100644
+index 6a38418d40763705639d361e47201f8b26216052..5bf3c279b86ed0fa416ee7dd9923172d6e6261a5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -91,6 +91,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -3819,7 +3819,7 @@ index 0000000000000000000000000000000000000000..da7a325d070e194cd1664ed20dcb3a76
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bae5ddbd97bd3f3422c699c42f025337b7cef574..64994a9635efa36ec09623c3869f22faed09b21c 100644
+index 5e2dff9a30615b5580710f872a92ab9f07fca6cf..70604fbf6bdd5166fc91d57fb4db4a8337bc4727 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -766,6 +766,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -4199,7 +4199,7 @@ index 5f692d719fd270120207ebcf6d0a2a24e8d59f7b..3e2e355177e32856dac07dc8b98658ad
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8c4d8bcb332e5b567be8cfa397093ac7e8e5250b..cfc2005ee5639c88ad1e21f0dd41c917a7c5db05 100644
+index 92922db3f57877507c6443c49f4c021aee667b1d..b8d3c4d35cee2ba4678f6d22b8ea956d598d9d9b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -4446,7 +4446,7 @@ index ddc4570139fd9b82f4b740697e84775f5ff0a75a..d039e715624d33fc3ec9e87d5ad99241
          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 ac7c9efc53123e4fa964b33f67cf8196846056cc..f45b5ddc66024e993ac94436ee25a03e085742b4 100644
+index bd6dfddb3c076cf92588dd508975db0eee5c2962..d643ff0a0ae9d45711c9a40fc12af68157604a33 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -56,7 +56,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -4685,10 +4685,10 @@ index 0000000000000000000000000000000000000000..49dc0c441b9dd7e7745cf15ced67f383
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 254bc29d7188f08bac865bd56765f12dba753adc..8a4eb405f7e4a0e0a79a6b264610da1f970df79b 100644
+index 99a49ae13697940c2055f37df3c8c2e8383ecee9..7d66cc8e5e4a0f6710f12df8b75cc05bbc152c0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-@@ -186,4 +186,22 @@ public class DummyGeneratorAccess implements GeneratorAccess {
+@@ -188,4 +188,22 @@ public class DummyGeneratorAccess implements GeneratorAccess {
      public boolean a(BlockPosition blockposition, boolean flag, Entity entity, int i) {
          throw new UnsupportedOperationException("Not supported yet.");
      }

Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch

@@ -19,7 +19,7 @@ index 41c79650b169b87fbc70cf502438a5453a04f23d..b839769ceae8932bb121a0b96fde1e7d
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0622f0d8d765c1249fd97f27c3c83af519f01c00..3e679f66cd922cf0b47a84cdd1a83f311ddf6d0b 100644
+index 9da321fc0e02e4a2e47f515011df33714affd368..ee93b977b5f78855fd58a2055ca4e17255f3388b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;

Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch

@@ -80,7 +80,7 @@ index 7c7826cf3adb19814984ab627e4c4726d8933244..bd92ed2e6d4766f4f16ec3002c41b36b
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3e679f66cd922cf0b47a84cdd1a83f311ddf6d0b..f51325612fa14c1428679d6955a6d92322da7c84 100644
+index ee93b977b5f78855fd58a2055ca4e17255f3388b..e3f2e259b2c5e478bde45554995b9c742d9e2008 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -178,7 +178,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1003,7 +1003,7 @@ index aa68eb71b131c1d529ded6c651621cfab071b3c4..9cba62efdb051c9850bbf28b0be17a7e
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f51325612fa14c1428679d6955a6d92322da7c84..81f2c91f9e27e2ad2855b64a7849efa18505e952 100644
+index e3f2e259b2c5e478bde45554995b9c742d9e2008..98eec5efe474011665bd819d0d0b11abd6a068ea 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -1118,7 +1118,7 @@ index dccb315440f7429fe881bd0d12af8f1ae8e35c3d..96a95413f74592ef0a8e9367fd3ed81f
          if (!this.world.isClientSide && this.dN() && this.aC()) {
              this.damageEntity(DamageSource.DROWN, 1.0F);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64994a9635efa36ec09623c3869f22faed09b21c..fc92fbb05e442d453d6d5dd4e36143a576f55b6b 100644
+index 70604fbf6bdd5166fc91d57fb4db4a8337bc4727..0867ad04857c652dcbcdf130bb5353113ea039a0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -65,7 +65,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -1407,7 +1407,7 @@ index 3e2e355177e32856dac07dc8b98658ad1b717045..7c5eaff23ef6bf3cdf2575330ea6341d
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cfc2005ee5639c88ad1e21f0dd41c917a7c5db05..ef622ae8946c7caafa222c42749ddbd90425f61c 100644
+index b8d3c4d35cee2ba4678f6d22b8ea956d598d9d9b..88fa8d63c5bb2c76ba09db6bb002f6d6b6a42afc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1628,7 +1628,7 @@ index bd5a2eee9cb435a5ee75a39cea231151fba00387..a559f423b19a1e6f8efb632727025084
              CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f45b5ddc66024e993ac94436ee25a03e085742b4..dd02f7b8c0c0055a506bceab68cec98faf4a7641 100644
+index d643ff0a0ae9d45711c9a40fc12af68157604a33..9df9ce88e23b31f0303a3c84136a10ea14a6d33d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -1758,7 +1758,7 @@ index f45b5ddc66024e993ac94436ee25a03e085742b4..dd02f7b8c0c0055a506bceab68cec98f
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e34031d0afa6918ce70150531c7a5c5097bf23d9..384fece1d7a1b07b04b09b4876ded0d603b1840b 100644
+index 38d6a46ec51c12983d229d962eb7dc3701ce13fd..9947bbbb8ca2810bce420cdd12a1874afd6b1c0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2048,12 +2048,31 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch

@@ -31,7 +31,7 @@ index 2e869004c8c6b8bfbb002fb4eda04519d50390c8..8a6856e0fd7b9b515d98f45aaabefbc3
          this.b.setJumping(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 81f2c91f9e27e2ad2855b64a7849efa18505e952..f8a85f1c96729ad97aa5f21ac0468c92f243f079 100644
+index 98eec5efe474011665bd819d0d0b11abd6a068ea..a50b005b9f3fc58674560f42b9c4a20fd8b669fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1024,6 +1024,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -24,7 +24,7 @@ index 8ee2b9bb1bce698fce50ac1b3fc477fcafd0542c..d59b82b7bb1f6d1b231f4e394e0a67a3
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f8a85f1c96729ad97aa5f21ac0468c92f243f079..80f1c4930d6dd602210b07a50b10c45e9f80ae8a 100644
+index a50b005b9f3fc58674560f42b9c4a20fd8b669fa..e85172eb69b04746eab08abf213dcd02cd4513ee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1761,6 +1761,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -19,7 +19,7 @@ index aab33df7a36eb69300fedfce733985d6c239ca01..550232cb3819138b3bae0fa1c5142948
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fc92fbb05e442d453d6d5dd4e36143a576f55b6b..1fcdbbbc7b60edd1e87bab5f1c5d19a6755de17c 100644
+index 0867ad04857c652dcbcdf130bb5353113ea039a0..9eacc1ba58986c21c5d8dc8d8d14c6f3b48fd171 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1224,7 +1224,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -32,7 +32,7 @@ index fc92fbb05e442d453d6d5dd4e36143a576f55b6b..1fcdbbbc7b60edd1e87bab5f1c5d19a6
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 384fece1d7a1b07b04b09b4876ded0d603b1840b..e531fe5e77901e6478554c6269a83028e391db5f 100644
+index 9947bbbb8ca2810bce420cdd12a1874afd6b1c0c..c9995ba10ac864fe4168196fa1932b689dc0a534 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -224,7 +224,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;

Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch

@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1fcdbbbc7b60edd1e87bab5f1c5d19a6755de17c..0f2011a776619301dd6a133b9a4044b4f5b69cfc 100644
+index 9eacc1ba58986c21c5d8dc8d8d14c6f3b48fd171..7b58499c24d5a4296cc539087ca86d2ec4148b1c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -144,7 +144,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -140,7 +140,7 @@ index 1fcdbbbc7b60edd1e87bab5f1c5d19a6755de17c..0f2011a776619301dd6a133b9a4044b4
                      GameProfilerTick gameprofilertick = GameProfilerTick.a("Server");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e531fe5e77901e6478554c6269a83028e391db5f..0d28a442e0ffb524140208710b253ca88ae21f90 100644
+index c9995ba10ac864fe4168196fa1932b689dc0a534..4eaf0e5be8cfd5b6455701adace14fb750192af5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2045,6 +2045,17 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0025-Entity-Origin-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 80f1c4930d6dd602210b07a50b10c45e9f80ae8a..12730f52fdb0774dcf8be81547c8f03ef9f184a4 100644
+index e85172eb69b04746eab08abf213dcd02cd4513ee..bfe36be070677d215eadd3ad38f93c6bddab0b75 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -167,6 +167,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -101,7 +101,7 @@ index ad8a506bb430b26fe147a657a2f826daf9bf4d45..ad4807e0bdd6409bd798f995da8f43ce
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index dd02f7b8c0c0055a506bceab68cec98faf4a7641..eb53a8232371433aabe300af5629cf1735ff18fb 100644
+index 9df9ce88e23b31f0303a3c84136a10ea14a6d33d..f764eaf58d225d3c875dda66c1a2ac43ef3c1eae 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1088,6 +1088,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch

@@ -29,7 +29,7 @@ index d59b82b7bb1f6d1b231f4e394e0a67a3d154d7be..f7a0a33e49cadf9b2bd43f118c106937
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 12730f52fdb0774dcf8be81547c8f03ef9f184a4..be0ade74030c5f8584b5caa22d6d3084a0853afa 100644
+index bfe36be070677d215eadd3ad38f93c6bddab0b75..9e132052e1a9b997300e3f5d88473fc5f9ebdd73 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -420,9 +420,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

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

@@ -20,7 +20,7 @@ index f7a0a33e49cadf9b2bd43f118c106937760da762..50dec5cb5e924301842300e8fc80cb67
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 183346d37e36be70348ecf0f2f26a0e0ef35eab8..c3fc8de59042e97560785997fdb3f7bbdc6234e6 100644
+index 5bf3c279b86ed0fa416ee7dd9923172d6e6261a5..7012bd08fb4715eb66e6f47733b82f556c2b8a11 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -32,7 +32,7 @@ index 183346d37e36be70348ecf0f2f26a0e0ef35eab8..c3fc8de59042e97560785997fdb3f7bb
      private final RecipeBookServer recipeBook = new RecipeBookServer();
      private Vec3D cm;
      private int cn;
-@@ -752,6 +752,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -749,6 +749,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.getWorldServer().removePlayer(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;

Spigot-Server-Patches/0032-Optimize-explosions.patch

@@ -123,7 +123,7 @@ index bf156897acfe25c16a1b09a83a00ba3ab647a2dd..842563f2030382659a62a3a63d9af9d5
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0f2011a776619301dd6a133b9a4044b4f5b69cfc..e1af87a172d011a212aaafc55ef651ff60df35b6 100644
+index 7b58499c24d5a4296cc539087ca86d2ec4148b1c..991baec71cfeb79ee2108870645a19582f151def 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1208,6 +1208,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0034-Disable-thunder.patch

@@ -19,7 +19,7 @@ index 25e0717186366af580e512eedfd403b8efc64a75..41436a4ead736dc925ca77d4cabf925f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index eb53a8232371433aabe300af5629cf1735ff18fb..8c33ad47feeb1ab25e656d3171a829b149198322 100644
+index f764eaf58d225d3c875dda66c1a2ac43ef3c1eae..cca6879e8304a5f345ecc2603a189d898db283a5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -471,7 +471,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0035-Disable-ice-and-snow.patch

@@ -19,7 +19,7 @@ index 41436a4ead736dc925ca77d4cabf925f4e492d68..f53d8b96757cbedc5fbb16195952a7da
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8c33ad47feeb1ab25e656d3171a829b149198322..9eec2ec61777222c1290ad3112b003409001e51a 100644
+index cca6879e8304a5f345ecc2603a189d898db283a5..223482e468862407d53299219e2f4debecd0cd87 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -495,7 +495,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

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

@@ -19,7 +19,7 @@ index 428deed56dae597291670bea8c8a6a67ce4d940f..a4da22ea65d5fdba38f8dc331919088f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c3fc8de59042e97560785997fdb3f7bbdc6234e6..67c0d4e50aadc4712b941c7d2fff0d108e3acf17 100644
+index 7012bd08fb4715eb66e6f47733b82f556c2b8a11..b8a45b6c7f519e4948f14ccc39b505420c3a0dd7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -76,6 +76,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -30,7 +30,7 @@ index c3fc8de59042e97560785997fdb3f7bbdc6234e6..67c0d4e50aadc4712b941c7d2fff0d10
  
      // CraftBukkit start
      public String displayName;
-@@ -398,7 +399,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -395,7 +396,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              --this.noDamageTicks;
          }
  

Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch

@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ef622ae8946c7caafa222c42749ddbd90425f61c..b7c621547fe071f136413d91bc4aa43142a2ef42 100644
+index 88fa8d63c5bb2c76ba09db6bb002f6d6b6a42afc..8ecca907357119ed8eb67381914daba4ae6db38f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1615,6 +1615,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -48,7 +48,7 @@ index ef622ae8946c7caafa222c42749ddbd90425f61c..b7c621547fe071f136413d91bc4aa431
          } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0d28a442e0ffb524140208710b253ca88ae21f90..b16785d48f407101360fb27036e4cfc8cf51dd23 100644
+index 4eaf0e5be8cfd5b6455701adace14fb750192af5..b5660a117faff08befa28d26ebe0db5ff83e829a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -752,6 +752,29 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0046-Expose-server-CommandMap.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b16785d48f407101360fb27036e4cfc8cf51dd23..34b4dcdac921ccb3588281c7bb891e15526192fe 100644
+index b5660a117faff08befa28d26ebe0db5ff83e829a..6dedd9c3b36770ba1e03a8586e65c27ba822d9ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1699,6 +1699,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch

@@ -21,10 +21,10 @@ index 62e793b71b313146b86b466421e7a5f894bef9df..cd47a4ca069df26969de3051c2aac805
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index be0ade74030c5f8584b5caa22d6d3084a0853afa..3bda9ab2a19740e3b06f24e2bcc82cc9ea57858e 100644
+index 9e132052e1a9b997300e3f5d88473fc5f9ebdd73..1a8fc714f6e4663fc02c1df6a67aaa37d48f743d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2502,7 +2502,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2508,7 +2508,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
                  blockposition = new BlockPosition(d0, this.locY(), d1);
                  // CraftBukkit start
@@ -34,10 +34,10 @@ index be0ade74030c5f8584b5caa22d6d3084a0853afa..3bda9ab2a19740e3b06f24e2bcc82cc9
                      return null;
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 67c0d4e50aadc4712b941c7d2fff0d108e3acf17..e140009e73517feea5f2c9923091a3d528e801af 100644
+index b8a45b6c7f519e4948f14ccc39b505420c3a0dd7..7eb56761d9073156b30d4c981dcd4b4ba646f0bc 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -818,7 +818,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -815,7 +815,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              // CraftBukkit start
              Location enter = this.getBukkitEntity().getLocation();
              Location exit = (worldserver == null) ? null : new Location(worldserver.getWorld(), d0, d1, d2, f1, f);

Spigot-Server-Patches/0052-Add-velocity-warnings.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 34b4dcdac921ccb3588281c7bb891e15526192fe..fc21e609946f1724d31c4e5f4b276835127e78ff 100644
+index 6dedd9c3b36770ba1e03a8586e65c27ba822d9ad..911c7daafda30acd9dd03fc230700a4aeb535943 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -260,6 +260,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch

@@ -25,10 +25,10 @@ index abbf59bb91021821876a8960e8f77fac24457ec4..04430aae52205ee167662004e45c145b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3bda9ab2a19740e3b06f24e2bcc82cc9ea57858e..b75c6aa78dd9c7478912b0b68de7a27289a480ba 100644
+index 1a8fc714f6e4663fc02c1df6a67aaa37d48f743d..1903635fd3416965adbbba5af38ff29dac0c6670 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2195,6 +2195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2201,6 +2201,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {

Spigot-Server-Patches/0058-Complete-resource-pack-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b7c621547fe071f136413d91bc4aa43142a2ef42..3ee10d4895e92a1af9920b0e7ca428b842ec0787 100644
+index 8ecca907357119ed8eb67381914daba4ae6db38f..ffed0587323dbf522e478f43948bbb03c0af84a2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1381,7 +1381,11 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch

@@ -30,7 +30,7 @@ index a62f4bbb973b9cb6d1ee53f56a0897d70ae176af..f207abbe757ad403a29a7a012903aaa8
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fc21e609946f1724d31c4e5f4b276835127e78ff..6001092bd1f5b2ab6b4cc4d6ff2d9f6839728946 100644
+index 911c7daafda30acd9dd03fc230700a4aeb535943..6d453e01ce4a4eb732521e90379a0b402bfffcfb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -397,6 +397,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6001092bd1f5b2ab6b4cc4d6ff2d9f6839728946..b114e3115591095fd9ae72c76274981889d0c943 100644
+index 6d453e01ce4a4eb732521e90379a0b402bfffcfb..cb0914270e724dda76c2abf7de66733c16f89496 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2164,5 +2164,23 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch

@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b114e3115591095fd9ae72c76274981889d0c943..890c5e16459aea9e5acf64514ae97de0225cb603 100644
+index cb0914270e724dda76c2abf7de66733c16f89496..4e3a1c7d5cc4466e214ea4fd9b05bef892ecfef7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -863,8 +863,18 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0065-Add-World-Util-Methods.patch

@@ -45,7 +45,7 @@ index d039e715624d33fc3ec9e87d5ad992415e7dc6b9..d5c0d394feaf8bb991245dbdcc6252cf
          return (double) (blockposition.getX() + 1) > this.e() && (double) blockposition.getX() < this.g() && (double) (blockposition.getZ() + 1) > this.f() && (double) blockposition.getZ() < this.h();
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9eec2ec61777222c1290ad3112b003409001e51a..4548a38464fac65a88da26e95660542eeb482ccb 100644
+index 223482e468862407d53299219e2f4debecd0cd87..f38c88df648aa715aefb18018779efd8075d781e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -83,7 +83,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0069-Use-a-Shared-Random-for-Entities.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b75c6aa78dd9c7478912b0b68de7a27289a480ba..0b0dca503a91bbd7991996bf6c395991c993604d 100644
+index 1903635fd3416965adbbba5af38ff29dac0c6670..b5625318ca6bfeeada2d3fb009b711685265ebaa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0070-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -22,7 +22,7 @@ index d8b9d87bca6eb95c2cea91e4d8466b9792582d52..92d1dffbf436a21943b4a6aa0fabf54f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4548a38464fac65a88da26e95660542eeb482ccb..20200408da6cae15576926f79de22b955781201d 100644
+index f38c88df648aa715aefb18018779efd8075d781e..5e64aca8c318f2fd909cd0e934867e890a152373 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -475,7 +475,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch

@@ -32,7 +32,7 @@ index f87fc631255aa5948459f0726b188ebbbae13c5f..446a2ffcd95fd631750b74fd31b4c410
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e1af87a172d011a212aaafc55ef651ff60df35b6..db0184af459472c73df5990699def5bdaef573c2 100644
+index 991baec71cfeb79ee2108870645a19582f151def..a2954709415751d9688b5b3597f5b15ae5bd8ccb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1174,6 +1174,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -66,7 +66,7 @@ index 1e72dd313e1fe0f701f3d14fffdc9a6a8db78934..948e477e112cd1e27c74a29c6330b07f
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 20200408da6cae15576926f79de22b955781201d..0746d0cf0c517a28e8faf637ecc19fb07f6eac2b 100644
+index 5e64aca8c318f2fd909cd0e934867e890a152373..b800844c9a2ae76019213ccb64655eeea2885a67 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -82,6 +82,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0073-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0746d0cf0c517a28e8faf637ecc19fb07f6eac2b..a6747315cf3d9d5f22d95aade5b0d4df63bd18f8 100644
+index b800844c9a2ae76019213ccb64655eeea2885a67..85e6b6fbf99b177a15a04b91fce36a5dcbe0cc7b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1056,7 +1056,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch

@@ -18,7 +18,7 @@ index 58546550cba0dc239980ef6c920bd5db55328693..51970a4f134e29f5d2bf681d83aeeda9
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3ee10d4895e92a1af9920b0e7ca428b842ec0787..6a92865443cfe641b437df38927267c51d7c2457 100644
+index ffed0587323dbf522e478f43948bbb03c0af84a2..e65aa13ed4d751c7eec576b75496683d8b95d06f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1955,6 +1955,16 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -26,7 +26,7 @@ index fe2c8001897dc6d66ce0d24ddb1a5d3b79810294..538e6751f3bda77ba32256158d2a6a25
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6a92865443cfe641b437df38927267c51d7c2457..e550d505340254a93a357819994299f0cee79c2a 100644
+index e65aa13ed4d751c7eec576b75496683d8b95d06f..c865aab4f56d6b0544ef66a35ebf58e48c8afbb8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1693,7 +1693,16 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0085-Remove-unused-World-Tile-Entity-List.patch

@@ -67,7 +67,7 @@ index 58277457ef879c48f3678efeb2a646e116320754..bd7214e4679044461f141f3000f1dab6
              }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a6747315cf3d9d5f22d95aade5b0d4df63bd18f8..db02025e02de1d99e34771380dbf7e71b298d290 100644
+index 85e6b6fbf99b177a15a04b91fce36a5dcbe0cc7b..6bcead2505365ed2631cd991ac2dae99fff14f78 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1542,7 +1542,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0087-Configurable-Player-Collision.patch

@@ -19,7 +19,7 @@ index 7d726757d1083011a09c9f2ca37c33a81360e964..3d9a98936cfe933fd71fb82f07e1ba54
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index db0184af459472c73df5990699def5bdaef573c2..e4b92f63c9ac6f0c2bb52056645c91b86e9d8424 100644
+index a2954709415751d9688b5b3597f5b15ae5bd8ccb..48511aac1493322803c49b36edea547810efc701 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -435,6 +435,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -57,7 +57,7 @@ index d1581c9d9838797eb425020d21bd0fba432e5652..99dc43159f240135957aee35f6129f19
              packetdataserializer.a(this.c);
              packetdataserializer.a(this.d);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b6d4db1fffb7bab56f9a181e75579775e7d9fafd..dd8c91a05c4e55ee24268e9d5edad141d320e814 100644
+index 675b6b521f0583ccbc9f34cbc38c0c32d7e7f3f7..b7982bbff805b7bc73c9ce74007f32cf05eac5b1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -75,6 +75,7 @@ public abstract class PlayerList {

Spigot-Server-Patches/0091-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 e140009e73517feea5f2c9923091a3d528e801af..177f865688c40d0ecca72771007e2271626ab5cc 100644
+index 7eb56761d9073156b30d4c981dcd4b4ba646f0bc..ab89e508ee8b8142fb7c0b5101b0b0e157a68f35 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1570,20 +1570,28 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1567,20 +1567,28 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return s;
      }
  

Spigot-Server-Patches/0094-remove-null-possibility-for-getServer-singleton.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e4b92f63c9ac6f0c2bb52056645c91b86e9d8424..d6bbb462931fd1eb97d39fbbbf4b843aa0f17c2e 100644
+index 48511aac1493322803c49b36edea547810efc701..f449a9aa819fca1fa1db72b8a76a2f2a2739ff96 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -70,6 +70,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot
@@ -25,7 +25,7 @@ index e4b92f63c9ac6f0c2bb52056645c91b86e9d8424..d6bbb462931fd1eb97d39fbbbf4b843a
          this.m = new GameProfilerSwitcher(SystemUtils.a, this::ag);
          this.methodProfiler = GameProfilerDisabled.a;
          this.serverPing = new ServerPing();
-@@ -2035,7 +2037,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -2036,7 +2038,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Deprecated
      public static MinecraftServer getServer() {

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

@@ -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 db02025e02de1d99e34771380dbf7e71b298d290..792d2cb535954e02aec779b5076024f9fc0baf38 100644
+index 6bcead2505365ed2631cd991ac2dae99fff14f78..f99bb7f52254d7f052ecfce2b94da329a9d05eea 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1012,6 +1012,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0096-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -520,7 +520,7 @@ index 0000000000000000000000000000000000000000..d50410532c27bd2aa932c2a3f5765ca1
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0b0dca503a91bbd7991996bf6c395991c993604d..c4abb65702c4a25df696af02d04f26d168ee7900 100644
+index b5625318ca6bfeeada2d3fb009b711685265ebaa..562f2e3e639a07852951081ea0887a9c582be6c5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch

@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d6bbb462931fd1eb97d39fbbbf4b843aa0f17c2e..28ade7187d6fd61adbfe65a1944426168b131c4c 100644
+index f449a9aa819fca1fa1db72b8a76a2f2a2739ff96..793d4d928bac4febf090291eb773871b492cdc6d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -788,7 +788,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch

@@ -32,10 +32,10 @@ index 05ea87a473228f5b386258fae3943f3f4561eaa6..ac76bdd7e1d91b0d242539c4495948cd
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c4abb65702c4a25df696af02d04f26d168ee7900..6d6ce3b5a012f49b2e0725d66ad4bcae4a7310f7 100644
+index 562f2e3e639a07852951081ea0887a9c582be6c5..14351cc9e60a0b8d33d319da9d473e74072767d7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2646,6 +2646,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2652,6 +2652,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bU() {

Spigot-Server-Patches/0105-Fix-Double-World-Add-issues.patch

@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 792d2cb535954e02aec779b5076024f9fc0baf38..0ae5eb7da3c8baf6ff54cc3b83bba41127457134 100644
+index f99bb7f52254d7f052ecfce2b94da329a9d05eea..b68338310106858195099bb45b8bf4da723b8439 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -919,6 +919,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0108-Add-setting-for-proxy-online-mode-status.patch

@@ -45,7 +45,7 @@ index 060887d765604e4be82913607bb6266a278f5db6..c5957c2d6c54b076ebe7f9a432e30551
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 890c5e16459aea9e5acf64514ae97de0225cb603..fc76268c767aeee06dd802cc10df65bbff7ea536 100644
+index 4e3a1c7d5cc4466e214ea4fd9b05bef892ecfef7..04593705633b94b35c291e9622615ca0ad9ef9a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1477,7 +1477,8 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch

@@ -23,7 +23,7 @@ index 5827ef1e3eb35a11867ee4f92f301e1b0245c0fa..23c9e0f317073bb9c327ec49e0b0586d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e550d505340254a93a357819994299f0cee79c2a..a5757ffdbbb33f1ec046a95765bfdd13c100b376 100644
+index c865aab4f56d6b0544ef66a35ebf58e48c8afbb8..f92a994d3b0530a35195132adcf5af1ad1fcbb31 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1241,13 +1241,14 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch

@@ -21,7 +21,7 @@ index 23c9e0f317073bb9c327ec49e0b0586d2123e4e9..c4086de778cc2ccc958b1a94dd6e9cdb
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a5757ffdbbb33f1ec046a95765bfdd13c100b376..a264a32b7eb2ce21756f493b0fdac60e1368fffa 100644
+index f92a994d3b0530a35195132adcf5af1ad1fcbb31..17edeff6cf5c3f7fee5c17028d3231f70f358537 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -147,7 +147,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0112-Chunk-registration-fixes.patch

@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0ae5eb7da3c8baf6ff54cc3b83bba41127457134..022b05be76768cf0fb702ac5f9fa48c5e474391c 100644
+index b68338310106858195099bb45b8bf4da723b8439..809ae79c0febf8a6de8bf0ca4d996b68bff8a2b6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -728,7 +728,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0114-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 177f865688c40d0ecca72771007e2271626ab5cc..b7f7dd59fd9deaff9ec3797b395c91c91ce5b54c 100644
+index ab89e508ee8b8142fb7c0b5101b0b0e157a68f35..1f98d4bec282c46355e325dcb9fe0cb23394ba9e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -206,6 +206,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -203,6 +203,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void loadData(NBTTagCompound nbttagcompound) {
          super.loadData(nbttagcompound);

Spigot-Server-Patches/0118-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 b7f7dd59fd9deaff9ec3797b395c91c91ce5b54c..0f865f4f94d84da4eb6d0e1288ca7678a23545b2 100644
+index 1f98d4bec282c46355e325dcb9fe0cb23394ba9e..c1c858f9384eb6e952198e531633d0a571c39ac2 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;
@@ -27,7 +27,7 @@ index b7f7dd59fd9deaff9ec3797b395c91c91ce5b54c..0f865f4f94d84da4eb6d0e1288ca7678
      private final AdvancementDataPlayer advancementDataPlayer;
      private final ServerStatisticManager serverStatisticManager;
      private float lastHealthScored = Float.MIN_VALUE;
-@@ -414,13 +416,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -411,13 +413,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 b7f7dd59fd9deaff9ec3797b395c91c91ce5b54c..0f865f4f94d84da4eb6d0e1288ca7678
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -1436,7 +1445,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1433,7 +1442,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/0120-Allow-Reloading-of-Command-Aliases.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fc76268c767aeee06dd802cc10df65bbff7ea536..5281efee7b7abe7ce6e6c8709147c052e3bb972e 100644
+index 04593705633b94b35c291e9622615ca0ad9ef9a4..d670295d6857276e3382b5d38afa25d1c93d7278 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2193,5 +2193,24 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0122-Don-t-let-fishinghooks-use-portals.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6d6ce3b5a012f49b2e0725d66ad4bcae4a7310f7..de126bf6c95e90dd9a81ee8d815806b8908709ec 100644
+index 14351cc9e60a0b8d33d319da9d473e74072767d7..393a2d3ede8e82b33979f18e0cda796bf003f8ef 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -162,7 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0130-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 0f865f4f94d84da4eb6d0e1288ca7678a23545b2..7227717f1ede5d67432f97f527c2d18f9d1c656f 100644
+index c1c858f9384eb6e952198e531633d0a571c39ac2..7d6b1893ae6b7a3e937f8f83fc222709c8120814 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1936,7 +1936,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1933,7 +1933,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {
@@ -19,7 +19,7 @@ index 0f865f4f94d84da4eb6d0e1288ca7678a23545b2..7227717f1ede5d67432f97f527c2d18f
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a264a32b7eb2ce21756f493b0fdac60e1368fffa..1422b249c6136f2b06d46478cdf51e14e20bc0e3 100644
+index 17edeff6cf5c3f7fee5c17028d3231f70f358537..e04bb290a94f5cfc93b5bd2121e6b32610199237 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2569,7 +2569,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0135-Enforce-Sync-Player-Saves.patch

@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index dd8c91a05c4e55ee24268e9d5edad141d320e814..b351c9e0b1eefa482b661c12bd9e8f0abe7f203c 100644
+index b7982bbff805b7bc73c9ce74007f32cf05eac5b1..cc5fea8bce240e0585a334eeb311ce040b9ca040 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -961,11 +961,13 @@ public abstract class PlayerList {

Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index de126bf6c95e90dd9a81ee8d815806b8908709ec..e36855b969bdef5e85e6b29879f960b0675a7937 100644
+index 393a2d3ede8e82b33979f18e0cda796bf003f8ef..bd270ea92404c2055c09324988e1ec28109a8815 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1950,6 +1950,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0138-Cap-Entity-Collisions.patch

@@ -27,7 +27,7 @@ index 255b4081314162cbe344b008158c6f4584795fb8..04ee0856a8c62e1afb438d4fddf40e60
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e36855b969bdef5e85e6b29879f960b0675a7937..13b10732917ffb823688336e888a329c774cc251 100644
+index bd270ea92404c2055c09324988e1ec28109a8815..912f5be0264b604df175f5825765b03b319a841c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch

@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 28ade7187d6fd61adbfe65a1944426168b131c4c..878a9de29c728a0b49fb8ee15be85516176795bd 100644
+index 793d4d928bac4febf090291eb773871b492cdc6d..28478370fc182751178f7dd6c20435218174c700 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -91,6 +91,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -73,7 +73,7 @@ index 28ade7187d6fd61adbfe65a1944426168b131c4c..878a9de29c728a0b49fb8ee15be85516
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b351c9e0b1eefa482b661c12bd9e8f0abe7f203c..597b78c94dc9b8a8585515cd00ae003331b3ebb8 100644
+index cc5fea8bce240e0585a334eeb311ce040b9ca040..753efa30bdb0af9ac2b0ad11dfb7a6b052f91a09 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1072,10 +1072,15 @@ public abstract class PlayerList {

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

@@ -39,7 +39,7 @@ index d1cf7602a0c47723593be11c030d3c819426d4d4..0dc2ffcfceeffed2cb949d31c4f976bc
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1422b249c6136f2b06d46478cdf51e14e20bc0e3..13b3d746f911d80615c986f6ccb0377e28a407de 100644
+index e04bb290a94f5cfc93b5bd2121e6b32610199237..f62357be4225fa48dd445f0843c99235276566c7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1818,6 +1818,13 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -20,7 +20,7 @@ index c4086de778cc2ccc958b1a94dd6e9cdb5065076c..5fa63d7ca20b88a44d8800b3ebf74e4c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5281efee7b7abe7ce6e6c8709147c052e3bb972e..5b6b3263534e51103023d7f56b5952d9dae84b19 100644
+index d670295d6857276e3382b5d38afa25d1c93d7278..542b813d4c870b93faae055a067b2bcf9216437e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2212,5 +2212,10 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -186,7 +186,7 @@ index ce285b97cbdc9d74504d073fc659c295300dd720..af839f432d410601fbbe06b665e4e0fa
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 878a9de29c728a0b49fb8ee15be85516176795bd..b06bb3dccda23ebed1532e17f9699b9b6828d9d8 100644
+index 28478370fc182751178f7dd6c20435218174c700..737159212c5139ba07dca2484c6cce8946167dba 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -58,7 +58,7 @@ import org.apache.logging.log4j.LogManager;
@@ -245,7 +245,7 @@ index 878a9de29c728a0b49fb8ee15be85516176795bd..b06bb3dccda23ebed1532e17f9699b9b
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 597b78c94dc9b8a8585515cd00ae003331b3ebb8..650755c0a6df59260a5f7c8cb041b2a8fe63e4a8 100644
+index 753efa30bdb0af9ac2b0ad11dfb7a6b052f91a09..a17cae9d7f9c18b7f9a3d7970e902f4a8cbb7d7b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -79,8 +79,7 @@ public abstract class PlayerList {
@@ -259,7 +259,7 @@ index 597b78c94dc9b8a8585515cd00ae003331b3ebb8..650755c0a6df59260a5f7c8cb041b2a8
  
          this.k = new GameProfileBanList(PlayerList.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5b6b3263534e51103023d7f56b5952d9dae84b19..9105049e37c955dfab036dcf3703603ea67026d4 100644
+index 542b813d4c870b93faae055a067b2bcf9216437e..1294df20d8f958103a3e207ecca80c102fa91b56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -46,7 +46,7 @@ import java.util.function.Consumer;

Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9105049e37c955dfab036dcf3703603ea67026d4..3836938a64f37f18bb3d809bd6e4ccf5fb4e8a72 100644
+index 1294df20d8f958103a3e207ecca80c102fa91b56..9c7667d042e01dc4d614564770bc59fa7daba598 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -105,6 +105,7 @@ import net.minecraft.server.WorldNBTStorage;

Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch

@@ -463,7 +463,7 @@ index d88946122e98abdefed54b29f510c7d4049fdff6..55c79f17a25f1bfe80cbc65e8c01ea17
              GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
              UserCache usercache = new UserCache(gameprofilerepository, new File(file, MinecraftServer.b.getName()));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b06bb3dccda23ebed1532e17f9699b9b6828d9d8..62ca208a95434ca1d8970b01f7291647e0b1f93f 100644
+index 737159212c5139ba07dca2484c6cce8946167dba..5a5fc0626562d46f1ea6ce3e779e75de55611548 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1601,6 +1601,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -519,7 +519,7 @@ index 4f769211cf98c3da720a904da3dcdcd4c7611f0b..a038397028848edb4f43cd4f72625466
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3836938a64f37f18bb3d809bd6e4ccf5fb4e8a72..1331e3b5795c804223da713ee951786d2c073ecc 100644
+index 9c7667d042e01dc4d614564770bc59fa7daba598..a77beb5b66923bcc35974a2dd51b671ba8bd0078 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -225,6 +225,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;

Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 13b10732917ffb823688336e888a329c774cc251..039a95a62e115f7095c38eb9a161dc0ff054a50a 100644
+index 912f5be0264b604df175f5825765b03b319a841c..2dfc881894753469080a5038c770e126cb19a806 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0160-ProfileWhitelistVerifyEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 650755c0a6df59260a5f7c8cb041b2a8fe63e4a8..fbacfe2c825f71b3c8617a3bf022f6793eb64996 100644
+index a17cae9d7f9c18b7f9a3d7970e902f4a8cbb7d7b..d5e7a41b39cb384cf9b52303bcbe11ae09b4162b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -540,9 +540,9 @@ public abstract class PlayerList {

Spigot-Server-Patches/0171-Add-PlayerJumpEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 13b3d746f911d80615c986f6ccb0377e28a407de..35cabf3fa68ade8d9de2429457293a54c283f1c4 100644
+index f62357be4225fa48dd445f0843c99235276566c7..0eb28ad05372a5692412e05974045826fa24abbe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;

Spigot-Server-Patches/0172-handle-PacketPlayInKeepAlive-async.patch

@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 35cabf3fa68ade8d9de2429457293a54c283f1c4..0a1c965570b91f1665673121d8890c5f6137c5bc 100644
+index 0eb28ad05372a5692412e05974045826fa24abbe..1d28b2b382877bb24958f28739e90bacfe8b9a94 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2530,14 +2530,18 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0174-revert-serverside-behavior-of-keepalives.patch

@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0a1c965570b91f1665673121d8890c5f6137c5bc..6a3d4d87c242c7acd06e8bc8633bebdda3460919 100644
+index 1d28b2b382877bb24958f28739e90bacfe8b9a94..76cd3ea9512f4355a055d9c683d939680dc5a1b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch

@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6a3d4d87c242c7acd06e8bc8633bebdda3460919..77060bd127cedd4baa9bc88e700c23faf74d0057 100644
+index 76cd3ea9512f4355a055d9c683d939680dc5a1b7..ccf083fbfa97b2a24338a3c1fe18e9a8c850feaf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -527,10 +527,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -72,7 +72,7 @@ index 6a3d4d87c242c7acd06e8bc8633bebdda3460919..77060bd127cedd4baa9bc88e700c23fa
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1331e3b5795c804223da713ee951786d2c073ecc..0305b1100711e57288c639078a15bee89b0d7964 100644
+index a77beb5b66923bcc35974a2dd51b671ba8bd0078..3954eb18bb28ad9033c957e05a13068b8751dbc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1785,7 +1785,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch

@@ -29,7 +29,7 @@ index 7abd3683f9cc21b90dc74739954de2decddf6478..6921def2dc8dd7f2b8ba9d46ab697a9f
                  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 7227717f1ede5d67432f97f527c2d18f9d1c656f..6414ff3ca7e5f217268f7114f7ac751532444af6 100644
+index 7d6b1893ae6b7a3e937f8f83fc222709c8120814..d2c61467b8373444609a6aad9688c5b747547d9c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1,5 +1,6 @@

Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch

@@ -177,7 +177,7 @@ index 0000000000000000000000000000000000000000..a85466bc7e0a8aa54b9eff14077fe6c9
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 62ca208a95434ca1d8970b01f7291647e0b1f93f..30d04825b8a65e0af66f3591ee6baaa433893b54 100644
+index 5a5fc0626562d46f1ea6ce3e779e75de55611548..1698b42ed56a2932c5c1d60c655c9fd4cf5bed66 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2,6 +2,9 @@ package net.minecraft.server;
@@ -200,10 +200,10 @@ index 62ca208a95434ca1d8970b01f7291647e0b1f93f..30d04825b8a65e0af66f3591ee6baaa4
  
              for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index d9d9999e79f888d9d9ac0ef9ae5b3db67ac405ed..da804a9904c0bf7219729e9b9aca1bfc72dd10d6 100644
+index d38de25d71ba1eb405e34ba2b04a2cfbccd637cc..ee18dc3fa2d0beeccbe1539573cce433f87566b8 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
-@@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener {
+@@ -35,6 +35,8 @@ public class PacketStatusListener implements PacketStatusInListener {
              this.networkManager.close(PacketStatusListener.a);
          } else {
              this.d = true;
@@ -212,7 +212,7 @@ index d9d9999e79f888d9d9ac0ef9ae5b3db67ac405ed..da804a9904c0bf7219729e9b9aca1bfc
              // CraftBukkit start
              // this.networkManager.sendPacket(new PacketStatusOutServerInfo(this.minecraftServer.getServerPing()));
              final Object[] players = minecraftServer.getPlayerList().players.toArray();
-@@ -132,6 +134,9 @@ public class PacketStatusListener implements PacketStatusInListener {
+@@ -130,6 +132,9 @@ public class PacketStatusListener implements PacketStatusInListener {
              ping.setServerInfo(new ServerPing.ServerData(minecraftServer.getServerModName() + " " + minecraftServer.getVersion(), version));
  
              this.networkManager.sendPacket(new PacketStatusOutServerInfo(ping));

Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch

@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0305b1100711e57288c639078a15bee89b0d7964..03ab59bceca94ab23278b8f531ccdcc6a85da799 100644
+index 3954eb18bb28ad9033c957e05a13068b8751dbc9..22b5a20b1183d2421e4f43245b1ace30adffb7e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1481,6 +1481,26 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 77060bd127cedd4baa9bc88e700c23faf74d0057..351eeb83d8a28b19e3805f0d8a377f4ed060c592 100644
+index ccf083fbfa97b2a24338a3c1fe18e9a8c850feaf..411e6ff17ac50a410da038ad538ad56ba3aef8a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2542,7 +2542,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 022b05be76768cf0fb702ac5f9fa48c5e474391c..0c677b8e1b1a103c7d727dba19fff1f74b7ed382 100644
+index 809ae79c0febf8a6de8bf0ca4d996b68bff8a2b6..10eb83bec33050ec1054de493960c87f67d4ec66 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -56,7 +56,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

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

@@ -34,10 +34,10 @@ index 08141147f9795546e9397abed95834ed5e69a126..d9e5d71a87140c90b79902887bd2f481
          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 ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138ee57f92d 100644
+index d2c61467b8373444609a6aad9688c5b747547d9c..dc8f88d102c06d8fb28ffd66de36f32efec54ff2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -411,7 +411,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -408,7 +408,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // Paper end
          if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
@@ -46,7 +46,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
              this.activeContainer = this.defaultContainer;
          }
  
-@@ -585,7 +585,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -582,7 +582,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 ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
          }
  
          String deathMessage = event.getDeathMessage();
-@@ -1166,7 +1166,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1163,7 +1163,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              return OptionalInt.empty();
          } else {
              if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
              }
  
              this.nextContainerCounter();
-@@ -1226,7 +1226,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1223,7 +1223,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // CraftBukkit end
          if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1290,7 +1290,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1287,7 +1287,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void closeInventory() {
@@ -88,7 +88,7 @@ index ac5f86c6fccd9410505e29bd60ba8351054703ed..290be5ffdfc5322d45dc5bca39de4138
          this.o();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 351eeb83d8a28b19e3805f0d8a377f4ed060c592..027f9a86f458aab7d94f132981a9c700a0afea57 100644
+index 411e6ff17ac50a410da038ad538ad56ba3aef8a8..201b2b0dcbaf6765390c18052f3b3450e63066e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2080,7 +2080,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -114,7 +114,7 @@ index d5e7a41b39cb384cf9b52303bcbe11ae09b4162b..3a2ab5a5745e2c698042357321bcfe7b
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0c677b8e1b1a103c7d727dba19fff1f74b7ed382..8a42f9ed3e1579b8b034de9321e5545505298d6b 100644
+index 10eb83bec33050ec1054de493960c87f67d4ec66..4675ddb1f7c989521dfc9fbd0367e6fbbaa7abda 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -967,7 +967,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0240-Refresh-player-inventory-when-cancelling-PlayerInter.patch

@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 027f9a86f458aab7d94f132981a9c700a0afea57..1bb64d388c27e3438b1f5ab70ccaa1aa529aa32c 100644
+index 201b2b0dcbaf6765390c18052f3b3450e63066e4..e3391017b3dcfbfc942b84118391928a6a5b807c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1989,6 +1989,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0242-Re-add-vanilla-entity-warnings-for-duplicates.patch

@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8a42f9ed3e1579b8b034de9321e5545505298d6b..c37b69b1632a72e3c7df5fd2643c0b3ff517d06b 100644
+index 4675ddb1f7c989521dfc9fbd0367e6fbbaa7abda..57be6e9c0062cfe94ad551abd7e8bea1213a10b6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -957,7 +957,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0245-add-more-information-to-Entity.toString.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 039a95a62e115f7095c38eb9a161dc0ff054a50a..2fcf43b7a2c5af2f7965a8556a3be9a086dc6420 100644
+index 2dfc881894753469080a5038c770e126cb19a806..50f9d217494ab2823596523839d5992fc480912d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2429,7 +2429,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2435,7 +2435,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {

Spigot-Server-Patches/0246-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2fcf43b7a2c5af2f7965a8556a3be9a086dc6420..f735c8cc9f68451ec64c2024769c37955e2ea963 100644
+index 50f9d217494ab2823596523839d5992fc480912d..8e128fa303b345a10535630fd58442435ef1e439 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -52,7 +52,7 @@ index 324967c892ff8878326af4229668fcbde37ef202..5540fc6eee8115400774b7a792b9d3b4
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c37b69b1632a72e3c7df5fd2643c0b3ff517d06b..9177f300e734afc5e4739655cdcb8b33866ff6cc 100644
+index 57be6e9c0062cfe94ad551abd7e8bea1213a10b6..fc6639d9729b2714389f191de7a21cb1aa853c75 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -83,6 +83,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0252-Vanished-players-don-t-have-rights.patch

@@ -17,7 +17,7 @@ index 26d446077bb563ca3c5bb0339695b3364a3e41bf..88a1db211286fc8a6164312d7eb0839c
              return this.getBlock().c(this.p(), iblockaccess, blockposition, voxelshapecollision);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f735c8cc9f68451ec64c2024769c37955e2ea963..f35ebacaf7c3a583d48efe58db9583c12c9c31a1 100644
+index 8e128fa303b345a10535630fd58442435ef1e439..af6f0c391e6e410f0bf4e4e6ddf6fd18bb4d26ed 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0254-Add-some-Debug-to-Chunk-Entity-slices.patch

@@ -58,7 +58,7 @@ index a27f91e6c3d1f5dd0adf8a3b48a640cc63676114..3ba19f75d24a1539c94f4fed9b8f90ae
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f35ebacaf7c3a583d48efe58db9583c12c9c31a1..e41c0a5891ef10ab7537f0f00ee6ab3e418d762c 100644
+index af6f0c391e6e410f0bf4e4e6ddf6fd18bb4d26ed..b0338278f3cfecdb30e1d2febf1ff2a04d0cc66d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0257-Prevent-Saving-Bad-entities-to-chunks.patch

@@ -80,7 +80,7 @@ index 28039aa8421207ce04840cc90e03d21bc8b7269f..17b8c4445af2bd2ed907d05ed3c396d4
      public static ChunkStatus.Type a(@Nullable NBTTagCompound nbttagcompound) {
          if (nbttagcompound != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9177f300e734afc5e4739655cdcb8b33866ff6cc..972a2fc6febc43156b8aa0917b881c6c604ec2c1 100644
+index fc6639d9729b2714389f191de7a21cb1aa853c75..e5fff59efc2d2794024eae93854a296d2b82cf3e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1000,6 +1000,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0259-Ignore-Dead-Entities-in-entityList-iteration.patch

@@ -51,7 +51,7 @@ index 3ba19f75d24a1539c94f4fed9b8f90aecc918cdc..f7be161c8557ae3848227b1a61e27374
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e41c0a5891ef10ab7537f0f00ee6ab3e418d762c..413dd5456d14842ab48143b6ee35e37dcb5ca3db 100644
+index b0338278f3cfecdb30e1d2febf1ff2a04d0cc66d..55f8863f823836065f4de8240bfeb490bd391a55 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index e41c0a5891ef10ab7537f0f00ee6ab3e418d762c..413dd5456d14842ab48143b6ee35e37d
      public float getBukkitYaw() {
          return this.yaw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 972a2fc6febc43156b8aa0917b881c6c604ec2c1..afba8d654bd227ad60ec502de8834c45f239f479 100644
+index e5fff59efc2d2794024eae93854a296d2b82cf3e..1a103dd830109e119acc1a371b37386e228586b5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1152,6 +1152,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0263-Break-up-and-make-tab-spam-limits-configurable.patch

@@ -45,7 +45,7 @@ index c8a7d8092a2849b62a8d83d7970756fd76100025..2e5c71d6b7d120a308076d95a3d5b73c
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1bb64d388c27e3438b1f5ab70ccaa1aa529aa32c..17247eb9c08de10da50b94d65ac3f05453805137 100644
+index e3391017b3dcfbfc942b84118391928a6a5b807c..351cb9643b05e83f97a7976979346325e76f44da 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0264-Add-hand-to-bucket-events.patch

@@ -95,7 +95,7 @@ index ca3e831e3191dd8ffe7f2b6ab9ecc05acfe1b0af..cc4421aa61d7d87c164c1f88ad8b5fa0
      public boolean s_() {
          return this.isClientSide;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index afba8d654bd227ad60ec502de8834c45f239f479..f6c459facde67500499365af6da9f43adcd80606 100644
+index 1a103dd830109e119acc1a371b37386e228586b5..a343cba51850bb7214c241a92db0694d3c1aaf60 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1483,15 +1483,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {

Spigot-Server-Patches/0267-Add-Early-Warning-Feature-to-WatchDog.patch

@@ -36,7 +36,7 @@ index 2e5c71d6b7d120a308076d95a3d5b73c5aca8bc9..1b21911c3e4fd1d4a3305176bb8477c3
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 30d04825b8a65e0af66f3591ee6baaa433893b54..3a7e2d1b2a11edbf430333bb8f4788c073dcf18e 100644
+index 1698b42ed56a2932c5c1d60c655c9fd4cf5bed66..b13d8ec9aa0a51d5432129f1b0ecef3beb5b7276 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -899,6 +899,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -48,7 +48,7 @@ index 30d04825b8a65e0af66f3591ee6baaa433893b54..3a7e2d1b2a11edbf430333bb8f4788c0
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03ab59bceca94ab23278b8f531ccdcc6a85da799..6aba97153123084f99088f10ccfc16ae8e3a0639 100644
+index 22b5a20b1183d2421e4f43245b1ace30adffb7e8..8cd2742f93b8d18c17053c94184c4c23990de951 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -803,6 +803,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0269-Use-ConcurrentHashMap-in-JsonList.patch

@@ -122,7 +122,7 @@ index 5b01e4edb3c0f8bc785b70128cbe31b14356e4fb..9213bfb78e92b838189161045e394558
  
          this.d.values().stream().map((jsonlistentry) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 31ffa627417745f87917933cb96873fd8657b49a..850a88c5b7887baf40787b21c04f40b9809157d7 100644
+index 3a2ab5a5745e2c698042357321bcfe7b1bd92154..c3acd5e610301de924eb1f49f00f9a3ae85eefb3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -543,7 +543,7 @@ public abstract class PlayerList {

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

@@ -27,7 +27,7 @@ index 6281f7900afab3ef1c9ba3c034b91cbfa1900f50..3c2f8407906879c8dca07b538f59f4bb
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 413dd5456d14842ab48143b6ee35e37dcb5ca3db..a704feb0c19b56964d017f9e0ea3f26bc3e975f8 100644
+index 55f8863f823836065f4de8240bfeb490bd391a55..a9664f03b8b7d2c12565b8c08891c7021aa5482b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1460,6 +1460,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -38,7 +38,7 @@ index 413dd5456d14842ab48143b6ee35e37dcb5ca3db..a704feb0c19b56964d017f9e0ea3f26b
      public void a(Entity entity, int i, DamageSource damagesource) {
          if (entity instanceof EntityPlayer) {
              CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2343,6 +2344,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2349,6 +2350,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fallDistance = 0.0F;
      }
  
@@ -279,7 +279,7 @@ index 4b249a644c680a7cc64b0d31cf453f94ff2b6a0c..d6a98bb7fc107649c179cded2d37c06a
          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 290be5ffdfc5322d45dc5bca39de4138ee57f92d..1b57f2ec7da87b4f87e35e1d5e6a272a641d0669 100644
+index dc8f88d102c06d8fb28ffd66de36f32efec54ff2..650579eb1bb73416b629229fce897d2941bd3b0d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -80,6 +80,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -293,7 +293,7 @@ index 290be5ffdfc5322d45dc5bca39de4138ee57f92d..1b57f2ec7da87b4f87e35e1d5e6a272a
  
      // CraftBukkit start
      public String displayName;
-@@ -582,6 +586,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -579,6 +583,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          String deathmessage = defaultMessage.getString();
          org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
@@ -309,7 +309,7 @@ index 290be5ffdfc5322d45dc5bca39de4138ee57f92d..1b57f2ec7da87b4f87e35e1d5e6a272a
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.activeContainer != this.defaultContainer) {
-@@ -733,8 +746,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -730,8 +743,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                          }
                      }
                  }

Spigot-Server-Patches/0304-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 b360077d72afafcaa23c438eb073b9286c8fb563..e0d7bb9c1df2898ead246265f4ab2f05396f59c8 100644
+index 650579eb1bb73416b629229fce897d2941bd3b0d..91de641e52693d2a776ae68810965b6e4643220f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1697,15 +1697,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1694,15 +1694,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity);
      }
  
@@ -88,7 +88,7 @@ index b360077d72afafcaa23c438eb073b9286c8fb563..e0d7bb9c1df2898ead246265f4ab2f05
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 17247eb9c08de10da50b94d65ac3f05453805137..f0d8388d6ac0ed5546d34f628a6b2ba6c56b1c61 100644
+index 351cb9643b05e83f97a7976979346325e76f44da..d33657d94a4e9c6563fbc7826e18624528c498f5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1133,6 +1133,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0305-Add-Velocity-IP-Forwarding-Support.patch

@@ -227,7 +227,7 @@ index 8cb29ddc0d5a5951ea35e1a16c023efb9b0be42d..2916119507ec5ecd9266569b0003d050
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index a7560ac0719d789f2b8ebc0294190a9bd43a2512..2098d8b0e1e7f71f0fe83d04625271b09e662a6f 100644
+index 91235f7bc80967a759ed8bb25d74ff0af6e25ef4..c20a3b6eb8c836d2d84995b91a98390e04e3ae51 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -164,6 +164,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -289,7 +289,7 @@ index ae74dc9e183e66062455cf2a18ab43ae87976046..7eb230f1b27eddf48f1b12fc78877a36
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
          this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6aba97153123084f99088f10ccfc16ae8e3a0639..b0ce13c6a62c77ba26dcd006df781ec00b3509f7 100644
+index 8cd2742f93b8d18c17053c94184c4c23990de951..237dda5e5c1bd3fc01152b865a7ed47617588cc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -675,7 +675,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0309-Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -20,7 +20,7 @@ index 37bd28f18d3f48767d8141bde3395b8443d5650a..a73b88d51608ce94f6e4c9013c8c4de9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f0d8388d6ac0ed5546d34f628a6b2ba6c56b1c61..e815200d1b81bd0d8a62e28a43cc01f4da956fa0 100644
+index d33657d94a4e9c6563fbc7826e18624528c498f5..b1bad421650a8c93cdc38d1f4f83ab1c39e2f624 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -350,6 +350,13 @@ public class PlayerConnection implements PacketListenerPlayIn {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a704feb0c19b56964d017f9e0ea3f26bc3e975f8..41c14d367e0b51e109001167d3c7b40676f364b8 100644
+index a9664f03b8b7d2c12565b8c08891c7021aa5482b..1a677783baa0b9a3dcfcd84caccba61d76fad2fb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2256,6 +2256,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2262,6 +2262,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -17,10 +17,10 @@ index a704feb0c19b56964d017f9e0ea3f26bc3e975f8..41c14d367e0b51e109001167d3c7b406
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e0d7bb9c1df2898ead246265f4ab2f05396f59c8..4b1923c81df02d0d48a5e61b9e4487d4a2fe789b 100644
+index 91de641e52693d2a776ae68810965b6e4643220f..2a4fc3d633924fbdfa166b3c3a39e0bae8a07310 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -2028,6 +2028,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2025,6 +2025,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.setHealth(this.getMaxHealth());

Spigot-Server-Patches/0312-Improve-Server-Thread-Pool-and-Thread-Priorities.patch

@@ -12,7 +12,7 @@ server threads
 Allow usage of a single thread executor by not using ForkJoin so single core CPU's.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3a7e2d1b2a11edbf430333bb8f4788c073dcf18e..601bf747ad7c4419d087573fc3098a1f84324c4d 100644
+index b13d8ec9aa0a51d5432129f1b0ecef3beb5b7276..f4c93a65c28eeca4a07aaf9b00507d5c6649d137 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -175,6 +175,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0313-Optimize-World-Time-Updates.patch

@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 601bf747ad7c4419d087573fc3098a1f84324c4d..e21359c9afe6db36be4176d0150c7906fb33876f 100644
+index f4c93a65c28eeca4a07aaf9b00507d5c6649d137..60067369f1d708ba53da9ad74be5a8330062a684 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1196,12 +1196,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0317-Don-t-allow-digging-into-unloaded-chunks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e815200d1b81bd0d8a62e28a43cc01f4da956fa0..247765de4032ca7d58cc5b415646d4a1816ff195 100644
+index b1bad421650a8c93cdc38d1f4f83ab1c39e2f624..a628f6b2aa792e53f223d40b2fd6a51826bc5c2a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1297,6 +1297,11 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0318-Book-Size-Limits.patch

@@ -22,7 +22,7 @@ index 478856f190a8d0177dee39dab4692fc54f9c8ed4..01d48da8b2f89ad3a615ad10c044c5f0
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 247765de4032ca7d58cc5b415646d4a1816ff195..7b3fb4a0a8f2883f8004343869058028ae30ce1f 100644
+index a628f6b2aa792e53f223d40b2fd6a51826bc5c2a..148d5037db35437136242af07f6cb5aacee6177f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Optional;

Spigot-Server-Patches/0319-Make-the-default-permission-message-configurable.patch

@@ -29,7 +29,7 @@ index 01d48da8b2f89ad3a615ad10c044c5f0a08ee4ed..f9b1b198299166759fe0bd0a36d8d88c
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b0ce13c6a62c77ba26dcd006df781ec00b3509f7..349c82ec94ba34bb584670422cea0db063968bf1 100644
+index 237dda5e5c1bd3fc01152b865a7ed47617588cc4..0fc130c00909a7f779d5f84bc9309b07277940cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2255,6 +2255,11 @@ public final class CraftServer implements Server {

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

@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 41c14d367e0b51e109001167d3c7b40676f364b8..505ba8e298a825ce69cc60c76cb040edeb0acdbd 100644
+index 1a677783baa0b9a3dcfcd84caccba61d76fad2fb..5c37d6f2523ead3eee082dc615d9b0c9fbd71443 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1948,12 +1948,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -60,17 +60,17 @@ index 41c14d367e0b51e109001167d3c7b40676f364b8..505ba8e298a825ce69cc60c76cb040ed
 -                        (LivingEntity) entity.getBukkitEntity()
 +                        (LivingEntity) entity.getBukkitEntity(), !suppressCancellation // Paper
                  );
-                 Bukkit.getPluginManager().callEvent(event);
-                 CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-@@ -2029,7 +2035,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+                 // Suppress during worldgen
+                 if (this.valid) {
+@@ -2032,7 +2038,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
              // Spigot start
 -            org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity());
 +            org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity(), !suppressCancellation); // Paper
-             Bukkit.getPluginManager().callEvent(event);
-             if (event.isCancelled()) {
-                 return false;
+             // Suppress during worldgen
+             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 afc665bfe9d527ca8d19f3ab9df0900d87f2d3f2..7916421fe1dd8eadfd1c9bd15c4bbbb7331faca6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
@@ -112,10 +112,10 @@ index d6a98bb7fc107649c179cded2d37c06a41146a89..84de18a6c207612ec3d3cca61749934b
              this.a(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4b1923c81df02d0d48a5e61b9e4487d4a2fe789b..76eff7dcb734f366b515d13a4a693adaa23695ad 100644
+index 2a4fc3d633924fbdfa166b3c3a39e0bae8a07310..fa975d4788281b66e63b4e8b9ad05c8a0f78c40a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1134,11 +1134,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1131,11 +1131,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
      }
  

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

@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 76eff7dcb734f366b515d13a4a693adaa23695ad..af4fd8beab932589a832c7f4916bc669376a6615 100644
+index fa975d4788281b66e63b4e8b9ad05c8a0f78c40a..b9125ca724c60026f0dcff40f570f6a5da8c993b 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 {
@@ -28,7 +28,7 @@ index 76eff7dcb734f366b515d13a4a693adaa23695ad..af4fd8beab932589a832c7f4916bc669
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 850a88c5b7887baf40787b21c04f40b9809157d7..74eadab4dedce86128cf39fd6c983ffe51c916fa 100644
+index c3acd5e610301de924eb1f49f00f9a3ae85eefb3..e48184b87b2c98cc2f103204ba62ed22a6fd3694 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -97,6 +97,7 @@ public abstract class PlayerList {

Spigot-Server-Patches/0327-Fix-PlayerEditBookEvent.patch

@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7b3fb4a0a8f2883f8004343869058028ae30ce1f..b7612fb450063e48a81ca95e7dedebb7f6e7789c 100644
+index 148d5037db35437136242af07f6cb5aacee6177f..6787046ca28e6942794abfae1a23e75314bd3435 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -890,9 +890,11 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0328-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 af4fd8beab932589a832c7f4916bc669376a6615..3a6bd8e7d78d8c6188c0594c9806181f30abea32 100644
+index b9125ca724c60026f0dcff40f570f6a5da8c993b..4f24399e4a37b1cf14c5c05b82515cc961764fd9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1400,6 +1400,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1397,6 +1397,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void p() {
          this.co = true;
          this.ejectPassengers();