Update upstream BD/B/CB/S

Note to other developers: This commit may require you to wipe your
workspace as a result of the changes to BD.

--- work/BuildData
Submodule work/BuildData f527a8ff..d56672db:
  > Mappings Update

--- work/Bukkit
Submodule work/Bukkit 0c1d258bb..db06c80d7:
  > Add list of entities to EntityTransformEvent
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks

---work/CraftBukkit
Submodule work/CraftBukkit 6a398ac44..068dab5be:
  > Enable optional source JAR shading via profile shadeSourcesJar
  > Use ImmutableList rather than AbstractList for CraftMetaBook
  > Fix setRecipes(List) not setting Knowledge Book recipes.
  > Mappings Update
  > Add list of entities to EntityTransformEvent & move die calls
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks
  > Add Vanilla help to default permissions

--- work/Spigot
Submodule work/Spigot a1f2566f6..e769fe4d9:
  > Mappings Update
  > Rebuild patches

Spigot-API-Patches/Add-EntityZapEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 new file mode 100644
-index 00000000..3547d063
+index 00000000..c8f0bb05
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 @@ -0,0 +0,0 @@
@@ -21,6 +21,7 @@ index 00000000..3547d063
 +import org.bukkit.event.entity.EntityTransformEvent;
 +
 +import javax.annotation.Nonnull;
++import java.util.Collections;
 +
 +/**
 + *  Fired when lightning strikes an entity
@@ -31,7 +32,7 @@ index 00000000..3547d063
 +    private final LightningStrike bolt;
 +
 +    public EntityZapEvent(final Entity entity, @Nonnull final LightningStrike bolt, @Nonnull final Entity replacementEntity) {
-+        super(entity, replacementEntity, TransformReason.LIGHTNING);
++        super(entity, Collections.singletonList(replacementEntity), TransformReason.LIGHTNING);
 +        Validate.notNull(bolt);
 +        Validate.notNull(replacementEntity);
 +        this.bolt = bolt;
@@ -73,12 +74,13 @@ index 00000000..3547d063
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 86983676..8dd1e3ce 100644
+index c1d4b30a..de8cad81 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-@@ -0,0 +0,0 @@
- package org.bukkit.event.entity;
+@@ -0,0 +0,0 @@ package org.bukkit.event.entity;
  
+ import java.util.Collections;
+ import org.bukkit.entity.Entity;
 +import com.destroystokyo.paper.event.entity.EntityZapEvent;
  import org.bukkit.entity.LightningStrike;
  import org.bukkit.entity.Pig;
@@ -96,7 +98,7 @@ index 86983676..8dd1e3ce 100644
      private final LightningStrike bolt;
  
      public PigZapEvent(final Pig pig, final LightningStrike bolt, final PigZombie pigzombie) {
--        super(pig, pigzombie, TransformReason.LIGHTNING);
+-        super(pig, Collections.singletonList((Entity) pigzombie), TransformReason.LIGHTNING);
 +        super(pig, bolt, pigzombie);
          this.bolt = bolt;
          this.pigzombie = pigzombie;

Spigot-API-Patches/Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch

@@ -217,7 +217,7 @@ index fe8d3468..074769c1 100644
          return key;
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 2278d470..60ed443a 100644
+index df51f3ca..e9f640fb 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -0,0 +0,0 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {

Spigot-Server-Patches/Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 5485c4bff3..00a46129b8 100644
+index d19d24683..5945e37a5 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 5485c4bff3..00a46129b8 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ade..124c3185bc 100644
+index 2b66a08ad..124c3185b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {

Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch

@@ -354,7 +354,7 @@ index 000000000..0e8acf12e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 081904dad..dacca4bc4 100644
+index c00ced8e8..197563552 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {

Spigot-Server-Patches/Add-EntityZapEvent.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 6bf914c9..23668ada 100644
+index d299e1efb..30306256a 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -0,0 +0,0 @@ public class EntityPig extends EntityAnimal {
-         if (!this.world.isClientSide && !this.dead) {
-             EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
+                 entitypigzombie.setCustomNameVisible(this.getCustomNameVisible());
+             }
  
 +            // Paper start
 +            if (CraftEventFactory.callEntityZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
@@ -22,7 +22,7 @@ index 6bf914c9..23668ada 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ab77d07b..7debc4d2 100644
+index 36ca76bc8..928c5eb41 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -39,7 +39,7 @@ index ab77d07b..7debc4d2 100644
              entitywitch.prepare(this.world.getDamageScaler(new BlockPosition(entitywitch)), (GroupDataEntity) null, (NBTTagCompound) null);
              entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 75bdad81..2132b09c 100644
+index c2b24f99f..1b82f22f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

Spigot-Server-Patches/Add-LivingEntity-getTargetEntity.patch

@@ -46,7 +46,7 @@ index 19819b134..49228a884 100644
      public MovingObjectPosition b(Vec3D vec3d, Vec3D vec3d1) {
          return this.a(vec3d, vec3d1, (BlockPosition)null);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dd96b09e6..d60dab95f 100644
+index 0f646ac7e..23e6f45bf 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -71,7 +71,7 @@ index dd96b09e6..d60dab95f 100644
          return this.d(this.pitch, this.yaw);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 83d648fff..a845856af 100644
+index 46a4e37a2..34b649dad 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;

Spigot-Server-Patches/Add-More-Creeper-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 19022b6e2..72b4735d4 100644
+index 569248abb..b1752d66f 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
@@ -26,7 +26,7 @@ index 19022b6e2..72b4735d4 100644
          if (!this.world.isClientSide) {
              boolean flag = this.world.getGameRules().getBoolean("mobGriefing");
 @@ -0,0 +0,0 @@ public class EntityCreeper extends EntityMonster {
-         return ((Boolean) this.datawatcher.get(EntityCreeper.c)).booleanValue();
+         return (Boolean) this.datawatcher.get(EntityCreeper.c);
      }
  
 +    // Paper start
@@ -40,7 +40,7 @@ index 19022b6e2..72b4735d4 100644
 +    }
 +
      public void dB() {
--        this.datawatcher.set(EntityCreeper.c, Boolean.valueOf(true));
+-        this.datawatcher.set(EntityCreeper.c, true);
 +        setIgnited(true);
 +        // Paper end
      }

Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b9227f7a7f..f5770884b0 100644
+index a6457e870..fadf1df28 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@
@@ -30,7 +30,7 @@ index b9227f7a7f..f5770884b0 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index a90ac68c30..49592e5572 100644
+index a13515a7f..bad1020c0 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -0,0 +0,0 @@ public enum EnumItemSlot {

Spigot-Server-Patches/Add-PlayerJumpEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 9614348157..b357cb2077 100644
+index d6333d9bb..96e3d20e3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index 9614348157..b357cb2077 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3289ba3ffd..b54da4eb79 100644
+index c8b251e69..00751a9d9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory;

Spigot-Server-Patches/Add-PlayerUseUnknownEntityEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index a4b98c81f5..53d38ea40f 100644
+index a4b98c81f..53d38ea40 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -0,0 +0,0 @@ import java.io.IOException;
@@ -18,7 +18,7 @@ index a4b98c81f5..53d38ea40f 100644
      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 e79ab51d29..085fa8cd49 100644
+index b67861519..dc2c143c8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/Add-ProjectileCollideEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 230a23d9..66e574bd 100644
+index cc38cfb04..46606ed5c 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -0,0 +0,0 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -26,7 +26,7 @@ index 230a23d9..66e574bd 100644
                  this.a(movingobjectposition);
                  this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 3e3619d7..58cc4824 100644
+index 3e3619d79..58cc4824c 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -0,0 +0,0 @@ public abstract class EntityFireball extends Entity {
@@ -46,7 +46,7 @@ index 3e3619d7..58cc4824 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index ad42f8ea..e33ecfcd 100644
+index ddd77583c..84a9375db 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
@@ -67,7 +67,7 @@ index ad42f8ea..e33ecfcd 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index ee402d41..fc8c0cab 100644
+index 11638221b..431afaf2f 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -0,0 +0,0 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -84,10 +84,10 @@ index ee402d41..fc8c0cab 100644
 +        // Paper end
 +
          if (movingobjectposition != null) {
-             if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.NETHER_PORTAL) {
-                 this.e(movingobjectposition.a());
+             if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.getBlockPosition()).getBlock() == Blocks.NETHER_PORTAL) {
+                 this.e(movingobjectposition.getBlockPosition());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 45cba844..36cad95a 100644
+index af61d99bc..8d12155c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

Spigot-Server-Patches/Add-TNTPrimeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 24573b4704..ea428e2daf 100644
+index 35a265fa2..3bacd8958 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -18,7 +18,7 @@ index 24573b4704..ea428e2daf 100644
  import java.util.Map.Entry;
 @@ -0,0 +0,0 @@ public class BlockFire extends Block {
  
-                 world.setTypeAndData(blockposition, (IBlockData) this.a((IBlockAccess) world, blockposition).set(BlockFire.AGE, Integer.valueOf(l)), 3);
+                 world.setTypeAndData(blockposition, (IBlockData) this.a((IBlockAccess) world, blockposition).set(BlockFire.AGE, l), 3);
              } else {
 -                world.setAir(blockposition);
 +                if(iblockdata.getBlock() != Blocks.TNT) world.setAir(blockposition); // Paper - TNTPrimeEvent - We might be cancelling it below, move the setAir down
@@ -38,7 +38,7 @@ index 24573b4704..ea428e2daf 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 81c5b60ea1..5fddb29612 100644
+index f97fccf56..c821e6b3b 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -0,0 +0,0 @@
@@ -112,7 +112,7 @@ index 81c5b60ea1..5fddb29612 100644
                  world.setAir(blockposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 2c735a920d..74d96a2f09 100644
+index 473773724..a49f1208b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;

Spigot-Server-Patches/Add-config-to-disable-ender-dragon-legacy-check.patch

@@ -19,7 +19,7 @@ index bd4cca26c..85296e48d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index e69c44ee2..f4a8a4b4d 100644
+index 1e22aa531..67808446c 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -0,0 +0,0 @@ public class EnderDragonBattle {
@@ -30,19 +30,18 @@ index e69c44ee2..f4a8a4b4d 100644
      private boolean k;
      private boolean l;
      private UUID m;
--    private boolean n;
-+    private boolean n; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
+-    private boolean n = true;
++    private boolean n = true; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
      private BlockPosition o;
      private EnumDragonRespawn p;
      private int q;
-     private List<EntityEnderCrystal> r;
+@@ -0,0 +0,0 @@ public class EnderDragonBattle {
+             hashset.add(entityplayer);
+         }
  
-     public EnderDragonBattle(WorldServer worldserver, NBTTagCompound nbttagcompound) {
-+        // Paper start
-+        setScanForLegacyFight(worldserver.paperConfig.scanForLegacyEnderDragon);
-+        if (!scanForLegacyFight()) setDragonKilled(true);
-+        // Paper end∂
-         this.c = (BossBattleServer) (new BossBattleServer(new ChatMessage("entity.minecraft.ender_dragon", new Object[0]), BossBattle.BarColor.PINK, BossBattle.BarStyle.PROGRESS)).setPlayMusic(true).c(true);
-         this.e = Lists.newArrayList();
-         this.n = true;
+-        HashSet hashset1 = Sets.newHashSet(this.bossBattle.getPlayers());
++        HashSet<EntityPlayer> hashset1 = Sets.newHashSet(this.bossBattle.getPlayers()); // Paper - decomp fix
+         hashset1.removeAll(hashset);
+ 
+         for(EntityPlayer entityplayer1 : hashset1) {
 --

Spigot-Server-Patches/Add-configurable-despawn-distances-for-living-entiti.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 341038fc4d..3e1f4be10f 100644
+index 341038fc4..3e1f4be10 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 341038fc4d..3e1f4be10f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index cc74150dae..9e95ede7fe 100644
+index 9d4d8c697..8f4319c80 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {

Spigot-Server-Patches/Add-exception-reporting-event.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 0000000000..93397188b7
+index 000000000..f699ce18c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +0,0 @@
@@ -48,9 +48,8 @@ index 0000000000..93397188b7
 +        return internalTask;
 +    }
 +}
-\ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d8ea5c1b5d..11fd68f597 100644
+index bc7ffbf8a..64342f54c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@
@@ -89,7 +88,7 @@ index d8ea5c1b5d..11fd68f597 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 709d384e95..a03748f738 100644
+index 6a9b9fa2a..557aa5180 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ import java.util.function.BooleanSupplier;
@@ -104,21 +103,23 @@ index 709d384e95..a03748f738 100644
              ichunkaccess.setLastSaved(this.world.getTime());
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
--            ChunkProviderServer.a.error("Couldn\'t save chunk", ioexception);
+-            ChunkProviderServer.a.error("Couldn't save chunk", ioexception);
 +            // Paper start
 +            String msg = "Couldn\'t save chunk";
 +            ChunkProviderServer.a.error(msg, ioexception);
 +            ServerInternalException.reportInternalException(ioexception);
          } catch (ExceptionWorldConflict exceptionworldconflict) {
--            ChunkProviderServer.a.error("Couldn\'t save chunk; already in use by another instance of Minecraft?", exceptionworldconflict);
+-            ChunkProviderServer.a.error("Couldn't save chunk; already in use by another instance of Minecraft?", exceptionworldconflict);
++            ChunkProviderServer.a.error("Couldn\'t save chunk; already in use by another instance of Minecraft?", exceptionworldconflict);
 +            String msg = "Couldn\'t save chunk; already in use by another instance of Minecraft?";
 +            ChunkProviderServer.a.error(msg, exceptionworldconflict);
 +            ServerInternalException.reportInternalException(exceptionworldconflict);
++            // Paper end
          }
  
      }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 1d830dff64..58d971cf20 100644
+index 399eb231d..6a59e798d 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -0,0 +0,0 @@
@@ -145,7 +146,7 @@ index 1d830dff64..58d971cf20 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index f991fddf7d..e888c9bdba 100644
+index f991fddf7..e888c9bdb 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@
@@ -172,7 +173,7 @@ index f991fddf7d..e888c9bdba 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index d18921271f..e5115863ec 100644
+index d18921271..e5115863e 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@
@@ -191,7 +192,7 @@ index d18921271f..e5115863ec 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index b919226bbf..ec43086ad1 100644
+index 4233b94a1..1ff5dcd85 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.LogManager;
@@ -219,7 +220,7 @@ index b919226bbf..ec43086ad1 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index e649d662ae..560edb523f 100644
+index e649d662a..560edb523 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -0,0 +0,0 @@
@@ -239,7 +240,7 @@ index e649d662ae..560edb523f 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 051259cf80..a25c90518f 100644
+index 3ecddf0fd..20ab0d420 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@
@@ -276,7 +277,7 @@ index 051259cf80..a25c90518f 100644
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index b21f7073f1..882b8fe4f1 100644
+index b21f7073f..882b8fe4f 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -0,0 +0,0 @@ public class WorldPersistentData {
@@ -288,7 +289,7 @@ index b21f7073f1..882b8fe4f1 100644
              throw throwable1;
          } finally {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 9dec941fb7..3f43d9eeab 100644
+index 311c4f5ca..e76882b8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -0,0 +0,0 @@ import java.util.function.Consumer;

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5f4f107d5a..b2e50f8532 100644
+index c9e9b45dc..6bb80975e 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -0,0 +0,0 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index 5f4f107d5a..b2e50f8532 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index b63da71512..b0dd30dd12 100644
+index 92c596e2c..edd35fe8a 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -0,0 +0,0 @@ public class ItemBucket extends Item {
@@ -56,8 +56,8 @@ index b63da71512..b0dd30dd12 100644
              boolean flag1 = material.isReplaceable();
  
              if (!world.isEmpty(blockposition) && !flag && !flag1 && (!(iblockdata.getBlock() instanceof IFluidContainer) || !((IFluidContainer) iblockdata.getBlock()).canPlace(world, blockposition, iblockdata, this.fluidType))) {
--                return movingobjectposition == null ? false : this.a(entityhuman, world, movingobjectposition.a().shift(movingobjectposition.direction), (MovingObjectPosition) null, enumdirection, clicked, itemstack); // CraftBukkit
-+                return movingobjectposition == null ? false : this.a(entityhuman, world, movingobjectposition.a().shift(movingobjectposition.direction), (MovingObjectPosition) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit // Paper - add enumhand
+-                return movingobjectposition == null ? false : this.a(entityhuman, world, movingobjectposition.getBlockPosition().shift(movingobjectposition.direction), (MovingObjectPosition) null, enumdirection, clicked, itemstack); // CraftBukkit
++                return movingobjectposition == null ? false : this.a(entityhuman, world, movingobjectposition.getBlockPosition().shift(movingobjectposition.direction), (MovingObjectPosition) null, enumdirection, clicked, itemstack, enumhand); // CraftBukkit  // Paper - add enumhand
              } else {
                  // CraftBukkit start
                  if (entityhuman != null) {
@@ -67,7 +67,7 @@ index b63da71512..b0dd30dd12 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          // TODO: inventory not updated
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f5fa6b13e1..396a37f69b 100644
+index 672c32858..cd6ae3b8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

Spigot-Server-Patches/Add-more-Witch-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index b5f676f04..41673ec9a 100644
+index 896388c41..7361d4c05 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -0,0 +0,0 @@
@@ -38,12 +38,12 @@ index b5f676f04..41673ec9a 100644
  
 +    public void setDrinkingPotion(boolean drinkingPotion) { a(drinkingPotion); } // Paper - OBFHELPER
      public void a(boolean flag) {
-         this.getDataWatcher().set(EntityWitch.c, Boolean.valueOf(flag));
+         this.getDataWatcher().set(EntityWitch.c, flag);
      }
  
 +    public boolean isDrinkingPotion() { return l(); } // Paper - OBFHELPER
      public boolean l() {
-         return ((Boolean) this.getDataWatcher().get(EntityWitch.c)).booleanValue();
+         return (Boolean) this.getDataWatcher().get(EntityWitch.c);
      }
 @@ -0,0 +0,0 @@ public class EntityWitch extends EntityMonster implements IRangedEntity {
                  }

Spigot-Server-Patches/Add-more-Zombie-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 69a12bab3..877d73f3b 100644
+index 2d87dca68..4c0ef6e28 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
@@ -28,17 +28,17 @@ index 69a12bab3..877d73f3b 100644
      public EntityZombie(EntityTypes<?> entitytypes, World world) {
          super(entitytypes, world);
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
-         this.getDataWatcher().register(EntityZombie.bF, Boolean.valueOf(false));
+         this.getDataWatcher().register(EntityZombie.bF, false);
      }
  
-+    public boolean isDrowning() { return dG(); } // Paper - OBFHELPER
-     public boolean dG() {
-         return ((Boolean) this.getDataWatcher().get(EntityZombie.bF)).booleanValue();
++    public boolean isDrowning() { return isDrownConverting(); } // Paper - OBFHELPER
+     public boolean isDrownConverting() {
+         return (Boolean) this.getDataWatcher().get(EntityZombie.bF);
      }
  
 +    public void setArmsRaised(boolean raised) { s(raised); } // Paper - OBFHELPER
      public void s(boolean flag) {
-         this.getDataWatcher().set(EntityZombie.bE, Boolean.valueOf(flag));
+         this.getDataWatcher().set(EntityZombie.bE, flag);
      }
  
 +    // Paper start
@@ -56,13 +56,13 @@ index 69a12bab3..877d73f3b 100644
  
 +    public void startDrowning(int drownedConversionTime) { a(drownedConversionTime); } // Paper - OBFHELPER
      private void a(int i) {
-         this.bJ = i;
-         this.getDataWatcher().set(EntityZombie.bF, Boolean.valueOf(true));
+         this.drownedConversionTime = i;
+         this.getDataWatcher().set(EntityZombie.bF, true);
      }
  
 +    // Paper start
 +    public void stopDrowning() {
-+        this.bJ = -1;
++        this.drownedConversionTime = -1;
 +        this.getDataWatcher().set(EntityZombie.drowning, Boolean.valueOf(false));
 +    }
 +    // Paper end
@@ -92,7 +92,7 @@ index 69a12bab3..877d73f3b 100644
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
          nbttagcompound.setBoolean("CanBreakDoors", this.dH());
          nbttagcompound.setInt("InWaterTime", this.isInWater() ? this.bI : -1);
-         nbttagcompound.setInt("DrownedConversionTime", this.dG() ? this.bJ : -1);
+         nbttagcompound.setInt("DrownedConversionTime", this.isDrownConverting() ? this.drownedConversionTime : -1);
 +        nbttagcompound.setBoolean("Paper.ShouldBurnInDay", shouldBurnInDay); // Paper
      }
  

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

@@ -26,7 +26,7 @@ index 02d99aec4..3507997fc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 816854dc2..64a8c6308 100644
+index 16a8cee3e..86c6beefe 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 816854dc2..64a8c6308 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ec58d8764..2146ef742 100644
+index 03b986bfa..c8b251e69 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -54,6 +54,6 @@ index ec58d8764..2146ef742 100644
 +            // Paper end
 +
              break;
- 
          case STOP_SNEAKING:
+             this.player.setSneaking(false);
 --

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

@@ -20,7 +20,7 @@ index f94fa5df2..1a8a90261 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f54cf3802..5c1735163 100644
+index 8e436c7f4..5e8c85cfb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -36,7 +36,7 @@ index f54cf3802..5c1735163 100644
 +
                  if (d10 - d9 > Math.max(100.0D, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && (!this.minecraftServer.H() || !this.minecraftServer.G().equals(entity.getDisplayName().getString()))) {
                  // CraftBukkit end
-                     PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), Double.valueOf(d6), Double.valueOf(d7), Double.valueOf(d8));
+                     PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), d6, d7, d8);
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          double d1 = this.player.locY;
                          double d2 = this.player.locZ;

Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch

@@ -23,7 +23,7 @@ index ae3d0f8f7..6b92ea437 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 6405f98e0..42e2f3d22 100644
+index 4ddc33ca5..3ecd69786 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -0,0 +0,0 @@ public class ServerStatisticManager extends StatisticManager {
@@ -37,8 +37,8 @@ index 6405f98e0..42e2f3d22 100644
 @@ -0,0 +0,0 @@ public class ServerStatisticManager extends StatisticManager {
  
                                              if (statistic == null) {
-                                                 ServerStatisticManager.b.warn("Invalid statistic in {}: Don\'t know what {} is", this.d, s2);
-+                                            if (com.destroystokyo.paper.PaperConfig.removeInvalidStatistics) invalidStats.add(s2); // Paper
+                                                 ServerStatisticManager.b.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2);
++                                                if (com.destroystokyo.paper.PaperConfig.removeInvalidStatistics) invalidStats.add(s2); // Paper
                                              } else {
                                                  this.a.put(statistic, nbttagcompound2.getInt(s2));
                                              }

Spigot-Server-Patches/Add-ray-tracing-methods-to-LivingEntity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 21d32178c..2aedfa808 100644
+index 1dcb9a7e9..5ea5d4b78 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -31,18 +31,6 @@ index 21d32178c..2aedfa808 100644
      public int shieldBlockingDelay = world.paperConfig.shieldBlockingDelay;
  
      public int getShieldBlockingDelay() {
-diff --git a/src/main/java/net/minecraft/server/MovingObjectPosition.java b/src/main/java/net/minecraft/server/MovingObjectPosition.java
-index 6d5dbe89a..a31f9f607 100644
---- a/src/main/java/net/minecraft/server/MovingObjectPosition.java
-+++ b/src/main/java/net/minecraft/server/MovingObjectPosition.java
-@@ -0,0 +0,0 @@ public class MovingObjectPosition {
-         this.pos = vec3d;
-     }
- 
-+    public BlockPosition getBlockPosition() { return a(); } // Paper - OBFHELPER
-     public BlockPosition a() {
-         return this.e;
-     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 index 52834b6da..eeab59379 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

Spigot-Server-Patches/Add-source-to-PlayerExpChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 3155ed94..1e25ade7 100644
+index e0a38b32a..2f6fd88ca 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -0,0 +0,0 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 3155ed94..1e25ade7 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2132b09c..45cba844 100644
+index 1b82f22f8..af61d99bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ import org.bukkit.entity.Player;

Spigot-Server-Patches/Add-sun-related-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index db9201d29..6c9776f57 100644
+index d92b6a6ea..6a1c8e8bd 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index db9201d29..6c9776f57 100644
          if (this.world.L() && !this.world.isClientSide) {
              float f = this.az();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 23529954b..7914f9b60 100644
+index 2b9da597a..d202360bd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

Spigot-Server-Patches/All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e28d5b19..3528b674 100644
+index e28d5b19a..3528b674f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index e28d5b19..3528b674 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 2a602c64..e913accd 100644
+index aa23cdff1..f92bf02b8 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -0,0 +0,0 @@ public class EntitySlime extends EntityInsentient implements IMonster {

Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch

@@ -20,7 +20,7 @@ index a2656abaf..95fc2d8ed 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7647311df..8167fe5c9 100644
+index 1dcc482c0..c5bddb1da 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -141,7 +141,7 @@ index 7647311df..8167fe5c9 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a8103ff68..21d32178c 100644
+index 3e9af4481..1dcb9a7e9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -159,11 +159,9 @@ index a8103ff68..21d32178c 100644
 -                case HAND:
 -                    itemstack = (ItemStack) this.bB.get(enumitemslot.b());
 -                    break;
--
 -                case ARMOR:
 -                    itemstack = (ItemStack) this.bC.get(enumitemslot.b());
 -                    break;
--
 -                default:
 -                    continue;
 -                }
@@ -191,7 +189,6 @@ index a8103ff68..21d32178c 100644
 -                    case HAND:
 -                        this.bB.set(enumitemslot.b(), itemstack1.isEmpty() ? ItemStack.a : itemstack1.cloneItemStack());
 -                        break;
--
 -                    case ARMOR:
 -                        this.bC.set(enumitemslot.b(), itemstack1.isEmpty() ? ItemStack.a : itemstack1.cloneItemStack());
 -                    }
@@ -207,18 +204,20 @@ index a8103ff68..21d32178c 100644
  
 +    // Paper start - split into own method from above
 +    public void updateEntityEquipment() {
-+        for (EnumItemSlot enumitemslot : EnumItemSlot.values()) {
++        EnumItemSlot[] aenumitemslot = EnumItemSlot.values();
++        int j = aenumitemslot.length;
++
++        for (int k = 0; k < j; ++k) {
++            EnumItemSlot enumitemslot = aenumitemslot[k];
 +            ItemStack itemstack;
 +
 +            switch (enumitemslot.a()) {
 +                case HAND:
 +                    itemstack = (ItemStack) this.bB.get(enumitemslot.b());
 +                    break;
-+
 +                case ARMOR:
 +                    itemstack = (ItemStack) this.bC.get(enumitemslot.b());
 +                    break;
-+
 +                default:
 +                    continue;
 +            }
@@ -246,7 +245,6 @@ index a8103ff68..21d32178c 100644
 +                    case HAND:
 +                        this.bB.set(enumitemslot.b(), itemstack1.isEmpty() ? ItemStack.a : itemstack1.cloneItemStack());
 +                        break;
-+
 +                    case ARMOR:
 +                        this.bC.set(enumitemslot.b(), itemstack1.isEmpty() ? ItemStack.a : itemstack1.cloneItemStack());
 +                }

Spigot-Server-Patches/Allow-nerfed-mobs-to-jump.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow nerfed mobs to jump
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a55163a458..341038fc4d 100644
+index a55163a45..341038fc4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index a55163a458..341038fc4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
-index 74a40671e9..5d6260ded1 100644
+index 74a40671e..5d6260ded 100644
 --- a/src/main/java/net/minecraft/server/ControllerJump.java
 +++ b/src/main/java/net/minecraft/server/ControllerJump.java
 @@ -0,0 +0,0 @@ public class ControllerJump {
@@ -31,7 +31,7 @@ index 74a40671e9..5d6260ded1 100644
          this.b.o(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 60b1dcd8ea..cc74150dae 100644
+index 7cf459d26..9d4d8c697 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -56,7 +56,7 @@ index 60b1dcd8ea..cc74150dae 100644
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index 15c04f890d..7db180fa90 100644
+index 15c04f890..7db180fa9 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalFloat extends PathfinderGoal {

Spigot-Server-Patches/Allow-specifying-a-custom-authentication-servers-dow.patch

@@ -27,7 +27,7 @@ index 963096fb3..a499578db 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 8bbea9624..10c82107d 100644
+index 90d1096e5..b682b3a43 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -39,6 +39,6 @@ index 8bbea9624..10c82107d 100644
 +                                LoginListener.this.disconnect(new ChatComponentText(com.destroystokyo.paper.PaperConfig.authenticationServersDownKickMessage));
 +                            } else // Paper end
                              LoginListener.this.disconnect(new ChatMessage("multiplayer.disconnect.authservers_down", new Object[0]));
-                             LoginListener.c.error("Couldn\'t verify username because servers are unavailable");
+                             LoginListener.c.error("Couldn't verify username because servers are unavailable");
                          }
 --

Spigot-Server-Patches/Async-Chunk-Loading-and-Generation.patch

@@ -458,7 +458,7 @@ index 000000000..8f18c2869
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 479a84a25..340b756bb 100644
+index a08e7ff2e..d86e12042 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -470,7 +470,7 @@ index 479a84a25..340b756bb 100644
  
          Iterator iterator = protochunk.s().iterator();
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 39ac032b0..1662e4eba 100644
+index e14ae2b42..1662e4eba 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -0,0 +0,0 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -508,7 +508,7 @@ index 39ac032b0..1662e4eba 100644
      }
  
      public Chunk a(Long olong, Chunk chunk) {
--        return this.a(olong.longValue(), chunk);
+-        return this.a(olong, chunk);
 +        return MCUtil.ensureMain("Chunk Put", () -> this.a(olong.longValue(), chunk)); // Paper
      }
  
@@ -556,7 +556,7 @@ index 39ac032b0..1662e4eba 100644
      // Paper end
  
      public Chunk a(Object object) {
--        return this.a(((Long) object).longValue());
+-        return this.a((Long) object);
 +        return MCUtil.ensureMain("Chunk Remove", () -> this.a(((Long) object).longValue())); // Paper
      }
  
@@ -576,7 +576,7 @@ index 39ac032b0..1662e4eba 100644
  
      public Chunk remove(Object object) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e64cb8051..7a1f84886 100644
+index dcc6e9762..87a1bddd0 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -718,7 +718,7 @@ index e64cb8051..7a1f84886 100644
 +        /*try {
              this.batchScheduler.a();
          } catch (InterruptedException interruptedexception) {
-             ChunkProviderServer.a.error("Couldn\'t stop taskManager", interruptedexception);
+             ChunkProviderServer.a.error("Couldn't stop taskManager", interruptedexception);
 -        }
 +        }*/
 +        // Paper end
@@ -726,7 +726,7 @@ index e64cb8051..7a1f84886 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 9b4bc3ff6..4c22f6d75 100644
+index 26a3f28cb..5ce57a6d4 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -775,7 +775,7 @@ index bdfc7d81f..a5c4564d6 100644
      public IBlockData getType(int i, int j, int k) {
          return this.blockIds.a(i, j, k);
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 34019bd1b..fc9091c80 100644
+index ad7e4a036..f10f235ed 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -0,0 +0,0 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@@ -944,7 +944,7 @@ index 271dc41d4..bd15534c2 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 13c0c7ee8..552be8cd8 100644
+index 522af3d53..ee878191a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -982,7 +982,7 @@ index 49fba0979..9ad646f8d 100644
          fx = fx % 360.0F;
          if (fx >= 180.0F) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 292547be3..5049595ab 100644
+index c73a61d94..17ae26cb8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -1732,7 +1732,7 @@ index 000000000..e9a38f9d9
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 2c7c8adf7..62c524ef3 100644
+index 068d203c8..cbff0d946 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -0,0 +0,0 @@ public class PlayerChunk {
@@ -1834,7 +1834,7 @@ index 2c7c8adf7..62c524ef3 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 95baa1dc8..9f6028586 100644
+index 39e5b2484..a92557fd2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -0,0 +0,0 @@ public class PlayerChunkMap {
@@ -1894,7 +1894,7 @@ index 95baa1dc8..9f6028586 100644
  
      private void e() {
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
-index 9c34319b6..7149b1472 100644
+index 38f3afb48..ddd7b91a9 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 @@ -0,0 +0,0 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@@ -1962,7 +1962,7 @@ index d868149d1..0d45d933e 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index a5cf017da..def8730b8 100644
+index d444eb30f..d8c96b5c3 100644
 --- a/src/main/java/net/minecraft/server/StructurePiece.java
 +++ b/src/main/java/net/minecraft/server/StructurePiece.java
 @@ -0,0 +0,0 @@ public abstract class StructurePiece {
@@ -2038,7 +2038,7 @@ index 1926c902a..1117e4ae2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 016d50d3c..f1495d30c 100644
+index eabf50e24..f8afa6f72 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -2282,7 +2282,7 @@ index fa99fe014..4f49786aa 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6e54b71e8..a54ea5a69 100644
+index bab0c0e0f..af68074c1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -2295,7 +2295,7 @@ index 6e54b71e8..a54ea5a69 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c56511abc..648ac4d18 100644
+index 2a9ff6d59..5945e1a6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -2361,7 +2361,7 @@ index 7e6a7b0e9..ef5a7bc38 100644
                      if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
                          unloadChunk(chunkCoordX + x, chunkCoordZ + z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c70890cc5..957ad628e 100644
+index 4a0a456a0..4068b8072 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

Spigot-Server-Patches/Auto-Save-Improvements.patch

@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index c278ac98d..ae3d0f8f7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 0cd15c17e..c43152f45 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ package com.destroystokyo.paper;
@@ -64,7 +64,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 9328c21cd..aa2ea7838 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -96,7 +96,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 516a583a8..27bed54d2 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -109,7 +109,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 3e4c80e0f..8506fad6f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -121,7 +121,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index bdf4aed1a..acdfb0e1e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -168,7 +168,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.methodProfiler.a("snooper");
          if (getSnooperEnabled() && !this.i.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 143c7c1be..1259ec9d6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
@@ -207,7 +207,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public WhiteList getWhitelist() {
          return this.whitelist;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index b37b284a5..6a5a7d1e0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -22,7 +22,7 @@ index bc74ea2f0..beec4e33c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f1645b3ea..204d622f0 100644
+index bb4498e0f..a9ef84d0e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Call PortalCreateEvent for exit portals
 
 
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 5e899e05cf..20f2a9197c 100644
+index 434589adb..7e858bab4 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -0,0 +0,0 @@ public class PortalTravelAgent {
@@ -53,13 +53,13 @@ index 5e899e05cf..20f2a9197c 100644
              i1 = MathHelper.clamp(i1, 70, this.world.ab() - 10);
              j5 = i1;
 @@ -0,0 +0,0 @@ public class PortalTravelAgent {
-                         l3 = j2 + (l2 - 1) * l5 - k2 * k5;
-                         boolean flag1 = i3 < 0;
+                         i4 = j2 + (i3 - 1) * l5 - k2 * k5;
+                         boolean flag1 = l2 < 0;
  
--                        blockposition_mutableblockposition.c(j3, k3, l3);
+-                        blockposition_mutableblockposition.c(j3, l3, i4);
 -                        this.world.setTypeUpdate(blockposition_mutableblockposition, flag1 ? Blocks.OBSIDIAN.getBlockData() : Blocks.AIR.getBlockData());
 +                        // Paper start
-+                        BlockPosition pos = new BlockPosition(j3, k3, l3);
++                        BlockPosition pos = new BlockPosition(j3, l3, i4);
 +                        nmsBlocks.put(pos, flag1 ? Blocks.OBSIDIAN.getBlockData() : Blocks.AIR.getBlockData());
 +                        bukkitBlocks.add(this.world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()));
 +                        // Paper end
@@ -67,9 +67,9 @@ index 5e899e05cf..20f2a9197c 100644
                  }
              }
 @@ -0,0 +0,0 @@ public class PortalTravelAgent {
-             for (l2 = -1; l2 < 4; ++l2) {
-                 if (k2 == -1 || k2 == 2 || l2 == -1 || l2 == 3) {
-                     blockposition_mutableblockposition.c(i5 + k2 * k5, j5 + l2, j2 + k2 * l5);
+             for (i3 = -1; i3 < 4; ++i3) {
+                 if (k2 == -1 || k2 == 2 || i3 == -1 || i3 == 3) {
+                     blockposition_mutableblockposition.c(i5 + k2 * k5, j5 + i3, j2 + k2 * l5);
 -                    this.world.setTypeAndData(blockposition_mutableblockposition, Blocks.OBSIDIAN.getBlockData(), 3);
 +                    // Paper start
 +                    BlockPosition pos = new BlockPosition(blockposition_mutableblockposition.getX(), blockposition_mutableblockposition.getY(), blockposition_mutableblockposition.getZ());
@@ -80,9 +80,9 @@ index 5e899e05cf..20f2a9197c 100644
              }
          }
 @@ -0,0 +0,0 @@ public class PortalTravelAgent {
-         for (l2 = 0; l2 < 2; ++l2) {
-             for (i3 = 0; i3 < 3; ++i3) {
-                 blockposition_mutableblockposition.c(i5 + l2 * k5, j5 + i3, j2 + l2 * l5);
+         for (i3 = 0; i3 < 2; ++i3) {
+             for (l2 = 0; l2 < 3; ++l2) {
+                 blockposition_mutableblockposition.c(i5 + i3 * k5, j5 + l2, j2 + i3 * l5);
 -                this.world.setTypeAndData(blockposition_mutableblockposition, iblockdata, 18);
 +
 +                // Paper start

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

@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5d152af154..02d99aec43 100644
+index 5d152af15..02d99aec4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 5d152af154..02d99aec43 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 45cd8dca16..c39e789529 100644
+index 04cd6350c..e26c9ee28 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 45cd8dca16..c39e789529 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 398ad151a0..d926cbb247 100644
+index 83605e7c7..be0a3f38e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/Catch-JsonParseException-in-Entity-and-TE-names.patch

@@ -26,7 +26,7 @@ index 729859d13..2a1dffbf4 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8abd71dfc..13c0c7ee8 100644
+index ab8490ff9..522af3d53 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -76,7 +76,7 @@ index b4fae0d30..364a9fa7a 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
-index 480faa66e..f3ddb86d0 100644
+index 22dcdc126..1467b540f 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 @@ -0,0 +0,0 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IWorl
@@ -115,7 +115,7 @@ index ddd2e0eb0..21bd156e9 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 0ba13b790..978b9c046 100644
+index 324a8431c..49e7fd064 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -0,0 +0,0 @@ public class TileEntityFurnace extends TileEntityContainer implements IWorldInve
@@ -128,7 +128,7 @@ index 0ba13b790..978b9c046 100644
  
          // Paper start - cook speed API
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 10e18bf34..46069bf80 100644
+index cdc576058..2dae75f45 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -0,0 +0,0 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -141,7 +141,7 @@ index 10e18bf34..46069bf80 100644
  
          this.f = nbttagcompound.getInt("TransferCooldown");
 diff --git a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
-index aa750ab91..36394aa78 100644
+index d4f379db9..59a0f4b2c 100644
 --- a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
 @@ -0,0 +0,0 @@ public class TileEntityShulkerBox extends TileEntityLootable implements IWorldIn

Spigot-Server-Patches/Chunk-Save-Stats-Debug-Option.patch

@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 917f57ced..570ddc1a8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -54,7 +54,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                  return false;
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index a2c3c066b..34ddf655e 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {

Spigot-Server-Patches/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 f2e7762d30..e79ab51d29 100644
+index a5bd908fd..b67861519 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -22,7 +22,7 @@ index f2e7762d30..e79ab51d29 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0c35c94b33..73abc95e41 100644
+index 0c35c94b3..73abc95e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch

@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5e51aef8..5d152af1 100644
+index 5e51aef84..5d152af15 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 5e51aef8..5d152af1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 7debc4d2..229eda02 100644
+index 928c5eb41..ac81a8d76 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {

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

@@ -19,7 +19,7 @@ index b4dba7247..1d32b93c8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8056dc40d..74c84dda6 100644
+index 7793626b5..bdd2c4b85 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -56,7 +56,7 @@ index f7a9b9d88..7befd80cf 100644
              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 2154c0516..baf870ac2 100644
+index 2cb5869ae..143c7c1be 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
@@ -79,7 +79,7 @@ index 2154c0516..baf870ac2 100644
 +        }
 +        // Paper end
          // CraftBukkit - Moved from above, added world
-         PlayerList.f.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, Integer.valueOf(entityplayer.getId()), entityplayer.world.worldData.getName(), Double.valueOf(entityplayer.locX), Double.valueOf(entityplayer.locY), Double.valueOf(entityplayer.locZ));
+         PlayerList.f.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.world.worldData.getName(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
      }
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
          entityplayer.playerTick();// SPIGOT-924

Spigot-Server-Patches/Configurable-cactus-and-reed-natural-growth-heights.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable cactus and reed natural growth heights
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b8a6161d8..32d00e274 100644
+index a73865739..098bd3fba 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index b8a6161d8..32d00e274 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 54685157f..83fb53643 100644
+index 27758bd01..918db3626 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
 @@ -0,0 +0,0 @@ public class BlockCactus extends Block {
@@ -32,11 +32,11 @@ index 54685157f..83fb53643 100644
  
 -                if (i < 3) {
 +            if (i < world.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
-                     int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
+                     int j = (Integer) iblockdata.get(BlockCactus.AGE);
  
                      if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 313821d52..c4e7f318d 100644
+index fad1a0a83..c7017c58e 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
 @@ -0,0 +0,0 @@ public class BlockReed extends Block {
@@ -45,7 +45,7 @@ index 313821d52..c4e7f318d 100644
  
 -            if (i < 3) {
 +                if (i < world.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
-                 int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue();
+                 int j = (Integer) iblockdata.get(BlockReed.AGE);
  
                  if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
 --

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

@@ -23,7 +23,7 @@ index 1c1ef2dc2..4c0a9f18c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aad33272f..598b747ec 100644
+index 1c881e7a7..a1a6703f6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 02c52958c8..fe56f01035 100644
+index 02c52958c..fe56f0103 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 02c52958c8..fe56f01035 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 73998e5a75..1d97a5442c 100644
+index 507641fc6..2bab2ab92 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1ed58f4bba..39d565db1f 100644
+index 1ed58f4bb..39d565db1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 1ed58f4bba..39d565db1f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 45ea6b138e..6b413833da 100644
+index c7db9db95..12fe12e04 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index 45ea6b138e..6b413833da 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 025158675f..932fbff7c7 100644
+index 5bee194fa..b52bc659e 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -0,0 +0,0 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT

Spigot-Server-Patches/Custom-replacement-for-eaten-items.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 91baaa5062..c3936c4e36 100644
+index 00b16251f..6d05cc244 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -20,7 +20,7 @@ This also makes the Chunk GC System useless, by auto scheduling unload as soon a
 a spare chunk is added to the server thats outside of view distance.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ff1a2046f6..0cd15c17e8 100644
+index ff1a2046f..0cd15c17e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index ff1a2046f6..0cd15c17e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 28ec8628dc..234c9eb1c3 100644
+index 757105c6f..9328c21cd 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -55,7 +55,7 @@ index 28ec8628dc..234c9eb1c3 100644
      public final int locZ;
      private boolean l;
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 71ddaf591e..39ac032b0b 100644
+index 2ebb2d834..e14ae2b42 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -0,0 +0,0 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -75,7 +75,7 @@ index 71ddaf591e..39ac032b0b 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 42d0731f0a..e32c9f9a62 100644
+index 1d08ec37f..516a583a8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -99,7 +99,7 @@ index 42d0731f0a..e32c9f9a62 100644
              this.chunkScheduler.a(booleansupplier);
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ac0e90eeca..2fd8fa30ee 100644
+index c7ea17e25..7cb1327a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -0,0 +0,0 @@ public class PlayerChunk {
@@ -160,7 +160,7 @@ index ac0e90eeca..2fd8fa30ee 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 1318ddd997..bc67565bf0 100644
+index b8d8fc779..e5605c309 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -0,0 +0,0 @@ public class PlayerChunkMap {
@@ -179,7 +179,7 @@ index 1318ddd997..bc67565bf0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8aa4138a2e..225f7574d2 100644
+index 49432f2eb..288152775 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -198,7 +198,7 @@ index 8aa4138a2e..225f7574d2 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 24e504c279..f0e974dffc 100644
+index 24e504c27..f0e974dff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
@@ -211,7 +211,7 @@ index 24e504c279..f0e974dffc 100644
              }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d08ef3fe10..081789a8fe 100644
+index d08ef3fe1..081789a8f 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -0,0 +0,0 @@ public class ActivationRange

Spigot-Server-Patches/Do-not-let-armorstands-drown.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 00a46129b8..6628af7778 100644
+index 5945e37a5..4ecf34a40 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 00a46129b8..6628af7778 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d926cbb247..b9227f7a7f 100644
+index be0a3f38e..a6457e870 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/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 5c1735163..f1645b3ea 100644
+index 5e8c85cfb..bb4498e0f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch

@@ -12,7 +12,7 @@ keep it vanilla in behavior
 a player may teleport away, and trigger instant despawn
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 200d46a8a0..db9201d292 100644
+index a28aa016c..d92b6a6ea 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {

Spigot-Server-Patches/Don-t-recheck-type-after-setting-a-block.patch

@@ -16,7 +16,7 @@ be having data corruption issues anyways.
 This provides a small boost to all setType calls.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index cc0413000..8d9d5ae9e 100644
+index b85a217fe..07bc23e28 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/Duplicate-UUID-Resolve-Option.patch

@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index deb0d4f05..75b591bc2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 43583b6ba..1c5737e3f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@
@@ -105,7 +105,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      private boolean l;
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
          if (i != this.locX || j != this.locZ) {
-             Chunk.d.warn("Wrong location! ({}, {}) should be ({}, {}), {}", Integer.valueOf(i), Integer.valueOf(j), Integer.valueOf(this.locX), Integer.valueOf(this.locZ), entity);
+             Chunk.d.warn("Wrong location! ({}, {}) should be ({}, {}), {}", i, j, this.locX, this.locZ, entity);
              entity.die();
 +            return; // Paper
          }
@@ -163,7 +163,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              this.world.a(entityslice.stream().filter((entity) -> {
                  return !(entity instanceof EntityHuman);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index a402f71a9..6c427e9aa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -175,7 +175,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 29c3a24f2..5557e9409 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -188,7 +188,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> c = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 0bb903aab..572c54c9c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/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 784b62c7c..c63055cec 100644
+index 67c993795..a5bd908fd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -48,7 +48,7 @@ index 784b62c7c..c63055cec 100644
          } else if (this.player.getChatFlags() == EntityHuman.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 cf1db412e..2bc16fb1a 100644
+index 4858265a8..4c177a674 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index f3fca99b..9ef0c22d 100644
+index 4bf6fd083..566846eb0 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -0,0 +0,0 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index f3fca99b..9ef0c22d 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index b0f7649b..152b179c 100644
+index b0f7649b8..152b179ce 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -0,0 +0,0 @@ public class ItemBow extends Item {
@@ -58,7 +58,7 @@ index b0f7649b..152b179c 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 36cad95a..246bd118 100644
+index 8d12155c3..3f17fbd37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

Spigot-Server-Patches/EntityTransformedEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 709dfb07..8ba9f3bb 100644
+index 175235a75..dab644930 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -0,0 +0,0 @@ public class EntityMushroomCow extends EntityCow {
@@ -14,10 +14,10 @@ index 709dfb07..8ba9f3bb 100644
                  }
 +                if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entitycow.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.SHEARED).callEvent()) return false; // Paper
                  this.world.addEntity(entitycow, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SHEARED);
-                 // CraftBukkit end
  
+                 this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 78a549b0..868d2483 100644
+index a11e66262..e4a570e01 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -29,7 +29,7 @@ index 78a549b0..868d2483 100644
              // CraftBukkit end
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 02bebf72..4b326bf6 100644
+index dc00725f9..823d4be7f 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
@@ -41,23 +41,23 @@ index 02bebf72..4b326bf6 100644
              this.die();
          }
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
+             if (CraftEventFactory.callEntityTransformEvent(this, entityzombievillager, EntityTransformEvent.TransformReason.INFECTION).isCancelled()) {
                  return;
              }
-             // CraftBukkit end
 +            if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entityvillager.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.INFECTED).callEvent()) return; // Paper
+             this.world.kill(entityvillager); // CraftBukkit - from above
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
-             this.world.a((EntityHuman) null, 1026, new BlockPosition(this), 0);
-         }
+             // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index cbbd2197..0e5dd111 100644
+index d2b2cc2fd..ab1b3ab5e 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -0,0 +0,0 @@ public class EntityZombieVillager extends EntityZombie {
+         if (CraftEventFactory.callEntityTransformEvent(this, entityvillager, EntityTransformEvent.TransformReason.CURED).isCancelled()) {
              return;
          }
-         // CraftBukkit end
 +        if (!new com.destroystokyo.paper.event.entity.EntityTransformedEvent(this.getBukkitEntity(), entityvillager.getBukkitEntity(), com.destroystokyo.paper.event.entity.EntityTransformedEvent.TransformedReason.CURED).callEvent()) return; // Paper
+         this.world.kill(this); // CraftBukkit - from above
          this.world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
-         if (this.bD != null) {
-             EntityHuman entityhuman = this.world.b(this.bD);
+         // CraftBukkit end
 --

Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index bb8b450a..163ce42c 100644
+index fb7688e9e..1bf01000e 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -0,0 +0,0 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index bb8b450a..163ce42c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 69c8e245..8993fe1a 100644
+index 3ec3053c7..473773724 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -0,0 +0,0 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index 69c8e245..8993fe1a 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 1e25ade7..3e2312b8 100644
+index 2f6fd88ca..dfd6230b2 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -0,0 +0,0 @@ public class EntityExperienceOrb extends Entity {
@@ -120,7 +120,7 @@ index 1e25ade7..3e2312b8 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index e33ecfcd..b164aff9 100644
+index 84a9375db..e494552f6 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
@@ -133,7 +133,7 @@ index e33ecfcd..b164aff9 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b2b575d0..48bb1480 100644
+index 3c6d02e27..83605e7c7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -147,7 +147,7 @@ index b2b575d0..48bb1480 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index a5e1939e..e73dba09 100644
+index a5e1939e0..e73dba09a 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -0,0 +0,0 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -160,7 +160,7 @@ index a5e1939e..e73dba09 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 229eda02..78a549b0 100644
+index ac81a8d76..a11e66262 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -173,7 +173,7 @@ index 229eda02..78a549b0 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 4a128f70..b8709646 100644
+index 4a128f707..b87096467 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -186,7 +186,7 @@ index 4a128f70..b8709646 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index c8cfa3ab..aa7780ef 100644
+index c8cfa3abe..aa7780eff 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -0,0 +0,0 @@ public class PlayerInteractManager {
@@ -199,7 +199,7 @@ index c8cfa3ab..aa7780ef 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 22c47c63..52e296d4 100644
+index a6999f868..4ab6747d4 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -221,7 +221,7 @@ index 22c47c63..52e296d4 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3a30349f..e1c09452 100644
+index 3a30349f4..e1c09452b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {
@@ -234,7 +234,7 @@ index 3a30349f..e1c09452 100644
              // not sure what this can do
              if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3..3302af0e 100644
+index 3a09cab3d..3302af0e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -0,0 +0,0 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d510ef63d1..2870015585 100644
+index 20a46e2af..6aa3a462f 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index d510ef63d1..2870015585 100644
          this.aH = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0a0ea301d9..8be0a47bae 100644
+index 0a0ea301d..8be0a47ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Expose-client-protocol-version-and-virtual-host.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 0000000000..5caca6439d
+index 000000000..5caca6439
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +0,0 @@
@@ -61,7 +61,7 @@ index 0000000000..5caca6439d
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 6aabdc2974..a02fa29217 100644
+index b4917c91b..25049a351 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -0,0 +0,0 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 6aabdc2974..a02fa29217 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 26da897243..4f3f88ff66 100644
+index 26da89724..4f3f88ff6 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 26da897243..4f3f88ff66 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 7acdac55e5..f1a3be69d0 100644
+index 7acdac55e..f1a3be69d 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -0,0 +0,0 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 7acdac55e5..f1a3be69d0 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a045ec3b22..0d76a42997 100644
+index 0df834fc1..8046a2a5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Fix-AIOOBE-in-inventory-handling.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b1e5ee47e..4af93ccf5 100644
+index 3ff82f71b..1c881e7a7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/Fix-Anvil-Level-sync-to-client.patch

@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 8731d857b..4b6424911 100644
+index a5ac893c4..a7b04a967 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -0,0 +0,0 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index 8731d857b..4b6424911 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1ddbb4329..a045ec3b2 100644
+index 05070285b..0df834fc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Fix-Sending-Chunks-to-Client.patch

@@ -14,7 +14,7 @@ This fix always sends chunks to the client, and simply updates
 the client anytime post processing is triggered with the new chunk data.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8d9d5ae9e..45c3aad70 100644
+index 07bc23e28..b9242d4a2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -41,7 +41,7 @@ index 8d9d5ae9e..45c3aad70 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 62c524ef3..36600523f 100644
+index cbff0d946..3ac09b91f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -0,0 +0,0 @@ public class PlayerChunk {

Spigot-Server-Patches/Fix-block-break-desync.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dc1f4f4e11..5f1d9cd40e 100644
+index 553f76b81..03b986bfa 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/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 aec39d8f7..e1a740cb9 100644
+index 371513042..871dea68f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch

@@ -18,7 +18,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7e7b62b1d..23529954b 100644
+index 3c99ae7cd..2b9da597a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch

@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 318c4204df..56787ed25c 100644
+index b9fa5ccc7..50812b70f 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -0,0 +0,0 @@ import com.mojang.brigadier.StringReader;
@@ -78,7 +78,7 @@ index 318c4204df..56787ed25c 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1d0580ff7f..2733cda407 100644
+index 2ef4ac64b..d1a546c8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -0,0 +0,0 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -201,7 +201,7 @@ index 1d0580ff7f..2733cda407 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 99276f1165..6528668816 100644
+index dfc5bb4fd..c00ced8e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ import java.lang.reflect.Constructor;
@@ -238,14 +238,14 @@ index 99276f1165..6528668816 100644
      private int repairCost;
      private int hideFlag;
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
-     private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
+     private static final CraftCustomTagTypeRegistry TAG_TYPE_REGISTRY = new CraftCustomTagTypeRegistry();
  
      private NBTTagCompound internalTag;
 -    private final Map<String, NBTBase> unhandledTags = new HashMap<String, NBTBase>();
 +    private final Map<String, NBTBase> unhandledTags = new TreeMap<>(); // Paper
+     private final CraftCustomItemTagContainer publicItemTagContainer = new CraftCustomItemTagContainer(TAG_TYPE_REGISTRY);
  
      CraftMetaItem(CraftMetaItem meta) {
-         if (meta == null) {
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          }
  

Spigot-Server-Patches/Hook-into-CB-plugin-rewrites.patch

@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 24d608399..212a50c88 100644
+index 875b4f77c..93e09e42f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -0,0 +0,0 @@ import java.io.FileOutputStream;
@@ -82,7 +82,7 @@ index 24d608399..212a50c88 100644
          OptionParser parser = new OptionParser();
 @@ -0,0 +0,0 @@ public class Commodore
  
-         cr.accept( new ClassVisitor( Opcodes.ASM7_EXPERIMENTAL, cw )
+         cr.accept( new ClassVisitor( Opcodes.ASM7, cw )
          {
 +            // Paper start - Rewrite plugins
 +            @Override

Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch

@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 6628af7778..7647311dfd 100644
+index 4ecf34a40..1dcc482c0 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 6628af7778..7647311dfd 100644
          return (this.bH & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185bc..9f5c3b92e3 100644
+index 124c3185b..9f5c3b92e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {

Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch

@@ -5,7 +5,7 @@ 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 1f98be261a..1cafad6bb6 100644
+index aacf411dc..623e7ec5f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.MainHand;
@@ -26,7 +26,7 @@ index 1f98be261a..1cafad6bb6 100644
              PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(getBukkitEntity(), packetplayinsettings.b());
              this.server.server.getPluginManager().callEvent(event);
          }
-         this.clientViewDistance = packetplayinsettings.b;
+         this.clientViewDistance = packetplayinsettings.viewDistance;
          // CraftBukkit end
 +        // Paper start - add PlayerLocaleChangeEvent
 +        // Since the field is initialized to null, this event should always fire the first time the packet is received
@@ -38,9 +38,9 @@ index 1f98be261a..1cafad6bb6 100644
 +        // Paper end
          this.cs = packetplayinsettings.d();
          this.ct = packetplayinsettings.e();
-         this.getDataWatcher().set(EntityPlayer.bx, Byte.valueOf((byte) packetplayinsettings.f()));
+         this.getDataWatcher().set(EntityPlayer.bx, (byte) packetplayinsettings.f());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1b2e7ed72b..1f21e54ab4 100644
+index 1b2e7ed72..1f21e54ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch

@@ -100,7 +100,7 @@ index 35c436d19..fcfb17e4e 100644
  
      public CompletableFuture<Suggestions> a(SuggestionsBuilder suggestionsbuilder) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index dacca4bc4..0b040527f 100644
+index 197563552..d34b017f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ import javax.annotation.Nullable;
@@ -117,9 +117,9 @@ index dacca4bc4..0b040527f 100644
   * Children must include the following:
   *
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
-     static final ItemMetaKey UNBREAKABLE = new ItemMetaKey("Unbreakable");
      @Specific(Specific.To.NBT)
      static final ItemMetaKey DAMAGE = new ItemMetaKey("Damage");
+     static final ItemMetaKey BUKKIT_CUSTOM_TAG = new ItemMetaKey("PublicBukkitValues");
 +    // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
 +    static final ItemMetaKey CAN_DESTROY = new ItemMetaKey("CanDestroy");
 +    static final ItemMetaKey CAN_PLACE_ON = new ItemMetaKey("CanPlaceOn");
@@ -137,7 +137,7 @@ index dacca4bc4..0b040527f 100644
 +    // Paper end
  
      private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
- 
+     private static final CraftCustomTagTypeRegistry TAG_TYPE_REGISTRY = new CraftCustomTagTypeRegistry();
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
          this.hideFlag = meta.hideFlag;
          this.unbreakable = meta.unbreakable;
@@ -152,11 +152,11 @@ index dacca4bc4..0b040527f 100644
 +        }
 +        // Paper end
          this.unhandledTags.putAll(meta.unhandledTags);
+         this.publicItemTagContainer.putAll(meta.publicItemTagContainer.getRaw());
  
-         this.internalTag = meta.internalTag;
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
-         if (tag.hasKey(DAMAGE.NBT)) {
-             damage = tag.getInt(DAMAGE.NBT);
+                 publicItemTagContainer.put(key, compound.get(key));
+             }
          }
 +        // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
 +        if (tag.hasKey(CAN_DESTROY.NBT)) {
@@ -253,14 +253,14 @@ index dacca4bc4..0b040527f 100644
  
      @Overridden
      boolean isEmpty() {
--        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasRepairCost() || !unhandledTags.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers());
-+        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasRepairCost() || !unhandledTags.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers()
+-        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasRepairCost() || !unhandledTags.isEmpty() || !publicItemTagContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers());
++        return !(hasDisplayName() || hasLocalizedName() || hasEnchants() || hasLore() || hasRepairCost() || !unhandledTags.isEmpty() || !publicItemTagContainer.isEmpty() || hideFlag != 0 || isUnbreakable() || hasDamage() || hasAttributeModifiers()
 +            || hasPlaceableKeys() || hasDestroyableKeys()); // Paper - Implement an API for CanPlaceOn and CanDestroy NBT values
      }
  
      public String getDisplayName() {
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
-                 && (this.unhandledTags.equals(that.unhandledTags))
+                 && (this.publicItemTagContainer.equals(that.publicItemTagContainer))
                  && (this.hideFlag == that.hideFlag)
                  && (this.isUnbreakable() == that.isUnbreakable())
 -                && (this.hasDamage() ? that.hasDamage() && this.damage == that.damage : !that.hasDamage());

Spigot-Server-Patches/Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 246bd118..a7d335d3 100644
+index 3f17fbd37..dfedd4c30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

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

@@ -27,7 +27,7 @@ index 9a74601b0..6e60d15cc 100644
          int i = this.f ? 300 : 100;
          if (this.g && (!this.b.isAlive() || this.b.ticksLived - this.c > i)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 665c85ca4..8abd71dfc 100644
+index da0e9b0a3..ab8490ff9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -55,7 +55,7 @@ index 665c85ca4..8abd71dfc 100644
          return SoundCategory.NEUTRAL;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 8167fe5c9..36e2c2e15 100644
+index c5bddb1da..0a9666541 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -69,7 +69,7 @@ index 8167fe5c9..36e2c2e15 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2aedfa808..83d648fff 100644
+index 5ea5d4b78..46a4e37a2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -207,7 +207,7 @@ index 2aedfa808..83d648fff 100644
          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 9dcf29609..720eb9184 100644
+index 6933d8876..d429e552e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -306,7 +306,7 @@ index 8be0a47ba..f56ef6f71 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e592dfb44..c70890cc5 100644
+index cd6ae3b8e..4a0a456a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

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

@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 44f37f50a..864691f87 100644
+index cded44bc4..101343849 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -29,7 +29,7 @@ index 44f37f50a..864691f87 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1d97a5442..d510ef63d 100644
+index 2bab2ab92..20a46e2af 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,7 +56,7 @@ index 1d97a5442..d510ef63d 100644
          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 edef46ac3..9dcf29609 100644
+index a615d7867..6933d8876 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -110,7 +110,7 @@ index edef46ac3..9dcf29609 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e1a740cb9..f9e6c2125 100644
+index 871dea68f..30d5c1734 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -123,7 +123,7 @@ index e1a740cb9..f9e6c2125 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8412b153f..e9ca51d91 100644
+index 64a86b699..e6ee5042c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
@@ -168,7 +168,7 @@ index 8699cc72f..0f1d700c7 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a7d335d30..630a43bc4 100644
+index dfedd4c30..b220895c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

Spigot-Server-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 18517704c..a8103ff68 100644
+index 8aef335a1..3e9af4481 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index a553fb7476..4048937c63 100644
+index a553fb747..4048937c6 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -0,0 +0,0 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -18,7 +18,7 @@ index a553fb7476..4048937c63 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7f8802b2ef..6ffc535146 100644
+index 7f8802b2e..6ffc53514 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 7f8802b2ef..6ffc535146 100644
                  }
              };
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 3bd0c56d46..304e47bf20 100644
+index 3bd0c56d4..304e47bf2 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -0,0 +0,0 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
@@ -88,7 +88,7 @@ index 3bd0c56d46..304e47bf20 100644
              DataBits databits = new DataBits(ix, 4096, along);
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedPlayerList.java b/src/main/java/net/minecraft/server/DedicatedPlayerList.java
-index 5eded6dc20..11f9642e6e 100644
+index 5eded6dc2..11f9642e6 100644
 --- a/src/main/java/net/minecraft/server/DedicatedPlayerList.java
 +++ b/src/main/java/net/minecraft/server/DedicatedPlayerList.java
 @@ -0,0 +0,0 @@ public class DedicatedPlayerList extends PlayerList {
@@ -101,7 +101,7 @@ index 5eded6dc20..11f9642e6e 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index 4dd4b01c82..987d944dbd 100644
+index 8bfa218a6..e2e60d3ed 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -0,0 +0,0 @@ public class DefinedStructure {
@@ -139,7 +139,7 @@ index 4dd4b01c82..987d944dbd 100644
              arraylist.add(definedstructure$a);
  
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 5c2d50f974..fd6df39f17 100644
+index 5c2d50f97..fd6df39f1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -0,0 +0,0 @@ public class EnchantmentManager {
@@ -188,7 +188,7 @@ index 5c2d50f974..fd6df39f17 100644
          boolean flag1 = itemstack.getItem() == Items.BOOK;
  
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 04cff50cb7..e746a6a0da 100644
+index 04cff50cb..e746a6a0d 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -0,0 +0,0 @@ public class EntityDragonFireball extends EntityFireball {
@@ -201,7 +201,7 @@ index 04cff50cb7..e746a6a0da 100644
                  entityareaeffectcloud.setSource(this.shooter);
                  entityareaeffectcloud.setParticle(Particles.j);
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 38c85f4ab7..c0853f0fcd 100644
+index 38c85f4ab..c0853f0fc 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -0,0 +0,0 @@ public enum EnumDirection implements INamable {
@@ -250,7 +250,7 @@ index 38c85f4ab7..c0853f0fcd 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index 3f5d6c3239..286c1b14f6 100644
+index 3f5d6c323..286c1b14f 100644
 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
 +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
 @@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -269,7 +269,7 @@ index 3f5d6c3239..286c1b14f6 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 0c9249cd8d..0648c76a07 100644
+index 0c9249cd8..0648c76a0 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -0,0 +0,0 @@ public class LocaleLanguage {
@@ -282,7 +282,7 @@ index 0c9249cd8d..0648c76a07 100644
                  this.d.put(entry.getKey(), s);
              }
 diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java
-index 9d01b70c7f..8daccdd6e9 100644
+index 9d01b70c7..8daccdd6e 100644
 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java
 @@ -0,0 +0,0 @@ public abstract class LootSelectorEntry {
@@ -301,7 +301,7 @@ index 9d01b70c7f..8daccdd6e9 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java
-index 7e88bcd6e4..b98dfe27d5 100644
+index 48d04b540..de9168a9c 100644
 --- a/src/main/java/net/minecraft/server/NBTBase.java
 +++ b/src/main/java/net/minecraft/server/NBTBase.java
 @@ -0,0 +0,0 @@ public interface NBTBase {
@@ -311,10 +311,10 @@ index 7e88bcd6e4..b98dfe27d5 100644
 -    NBTBase clone();
 +    public NBTBase clone(); // Paper - decompile fix
  
-     default String b_() {
+     default String asString() {
          return this.toString();
 diff --git a/src/main/java/net/minecraft/server/NBTList.java b/src/main/java/net/minecraft/server/NBTList.java
-index 456b5f4925..54f2935c08 100644
+index 456b5f492..54f2935c0 100644
 --- a/src/main/java/net/minecraft/server/NBTList.java
 +++ b/src/main/java/net/minecraft/server/NBTList.java
 @@ -0,0 +0,0 @@ public abstract class NBTList<T extends NBTBase> extends AbstractList<T> impleme
@@ -337,7 +337,7 @@ index 456b5f4925..54f2935c08 100644
 +    // Paper end- Decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
-index 11ffa6c342..5d61cf70bc 100644
+index 86881a22d..81ff1fd69 100644
 --- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
 @@ -0,0 +0,0 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
@@ -351,7 +351,7 @@ index 11ffa6c342..5d61cf70bc 100644
  
          System.arraycopy(this.data, 0, abyte, 0, this.data.length);
 diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
-index f5c9b97d5c..d121ad4f7a 100644
+index 40f6179cd..ebc44ec9e 100644
 --- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
 @@ -0,0 +0,0 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {
@@ -364,7 +364,7 @@ index f5c9b97d5c..d121ad4f7a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index 5b54cbde18..769d599c59 100644
+index 24a66f95a..2e7c96056 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
@@ -391,7 +391,7 @@ index 5b54cbde18..769d599c59 100644
 +    */ // Paper end - Decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 113e8780a8..8e312c7617 100644
+index 113e8780a..8e312c761 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -0,0 +0,0 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -404,7 +404,7 @@ index 113e8780a8..8e312c7617 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/Registry.java b/src/main/java/net/minecraft/server/Registry.java
-index 5be9f0ff2f..9efec49d66 100644
+index 5be9f0ff2..9efec49d6 100644
 --- a/src/main/java/net/minecraft/server/Registry.java
 +++ b/src/main/java/net/minecraft/server/Registry.java
 @@ -0,0 +0,0 @@
@@ -418,7 +418,7 @@ index 5be9f0ff2f..9efec49d66 100644
 +    Iterator<T> iterator(); // Paper - decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index 8d1f9237aa..a21006290c 100644
+index 8d1f9237a..a21006290 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -0,0 +0,0 @@ public class RegistryBlockID<T> implements Registry<T> {
@@ -431,7 +431,7 @@ index 8d1f9237aa..a21006290c 100644
  
          this.c.set(i, object);
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 03c6033622..d03ac0e70c 100644
+index 03c603362..d03ac0e70 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
@@ -444,7 +444,7 @@ index 03c6033622..d03ac0e70c 100644
          this.b = (K[])(new Object[i]);
          this.c = new int[i];
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index 7b8a8064b8..615aa2cd04 100644
+index 7b8a8064b..615aa2cd0 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -0,0 +0,0 @@ public class ServerPing {
@@ -493,7 +493,7 @@ index 7b8a8064b8..615aa2cd04 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
-index ef9d8e06fe..0c9910d9a5 100644
+index ef9d8e06f..0c9910d9a 100644
 --- a/src/main/java/net/minecraft/server/ShapeDetector.java
 +++ b/src/main/java/net/minecraft/server/ShapeDetector.java
 @@ -0,0 +0,0 @@ public class ShapeDetector {

Spigot-Server-Patches/Make-shield-blocking-delay-configurable.patch

@@ -19,7 +19,7 @@ index a005c8c4e..bd4cca26c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 666e3aaf6..d89f1fe03 100644
+index fadf1df28..67ed48652 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/Make-targetSize-more-aggressive-in-the-chunk-unload-.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e4d2a3a0b5..c0d48c33fc 100644
+index 570ddc1a8..3854464e8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {

Spigot-Server-Patches/Optimise-removeQueue.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c33c6f480c..891b804a6e 100644
+index 9929e2a73..c2957ad2e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ import com.mojang.authlib.GameProfile;
@@ -39,7 +39,7 @@ index c33c6f480c..891b804a6e 100644
 -            while (iterator.hasNext() && j < i) {
 +            // Paper start
 +            /* while (iterator.hasNext() && j < i) {
-                 aint[j++] = ((Integer) iterator.next()).intValue();
+                 aint[j++] = (Integer) iterator.next();
                  iterator.remove();
 +            } */
 +

Spigot-Server-Patches/Optimize-Chunk-Access.patch

@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index ca18901df..2ebb2d834 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -0,0 +0,0 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -69,9 +69,9 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    // Paper end
  
      public Chunk a(Object object) {
-         return this.a(((Long) object).longValue());
+         return this.a((Long) object);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 557aa5180..1d08ec37f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {

Spigot-Server-Patches/Optimize-Light-Recalculations.patch

@@ -14,7 +14,7 @@ Also optimizes to not repeatedly look up the same chunk for
 light lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 340b756bb..cc0413000 100644
+index d86e12042..b85a217fe 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -36,7 +36,7 @@ index 340b756bb..cc0413000 100644
                      int i1 = iblockdata.b(this.world, blockposition);
                      int j1 = iblockdata1.b(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f1495d30c..7e7b62b1d 100644
+index f8afa6f72..3c99ae7cd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

Spigot-Server-Patches/Optimize-and-Fix-ExpiringMap-Issues.patch

@@ -34,7 +34,7 @@ index c8c1444e8..6723343b8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ExpiringMap.java b/src/main/java/net/minecraft/server/ExpiringMap.java
-index ee97c2b6f..795e73542 100644
+index ae5a2077e..795e73542 100644
 --- a/src/main/java/net/minecraft/server/ExpiringMap.java
 +++ b/src/main/java/net/minecraft/server/ExpiringMap.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -239,10 +239,9 @@ index ee97c2b6f..795e73542 100644
      }
  
 -    public T put(Long olong, T t0) {
--        this.a(olong.longValue());
--        return super.put(olong, t0);
 +    public T put(Long olong, T object) {
-+        this.a(olong);
+         this.a(olong);
+-        return super.put(olong, t0);
 +        return (T)super.put(olong, object);
      }
  
@@ -288,7 +287,7 @@ index ee97c2b6f..795e73542 100644
 -    // CraftBukkit end    
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d83e85dbf..2105fa50b 100644
+index 49a06f395..9b2703fd2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati

Spigot-Server-Patches/Optimize-getChunkIfLoaded-type-calls.patch

@@ -10,7 +10,7 @@ Will improve inlining across many hot methods.
 Improve getBrightness to not do double chunk map lookups.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 501b91138..e64cb8051 100644
+index 3854464e8..dcc6e9762 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -23,7 +23,7 @@ index 501b91138..e64cb8051 100644
                      neighbor.setNeighborUnloaded(-x, -z);
                      chunk.setNeighborUnloaded(x, z);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d239fc6d3..a5c655155 100644
+index de591d912..5fe4734e3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -55,7 +55,7 @@ index d239fc6d3..a5c655155 100644
              return chunk != null && !chunk.isEmpty();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 098280e6d..2f034a9fa 100644
+index d5936eb19..4b8b66352 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -0,0 +0,0 @@ public class CraftWorld implements World {

Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch

@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 4048937c6..680764b34 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -0,0 +0,0 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -31,7 +31,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 5c5f19b4b..d81e2dc1c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
          public MutableBlockPosition() {
              this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 101d5bb01..6a23b1ec2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -84,7 +84,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              IBlockData iblockdata = null;
  
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 274c44948..7e4c79a1c 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -0,0 +0,0 @@ public class ChunkSection {
@@ -97,7 +97,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index befb3e23f..3bfb9397d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -167,7 +167,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
      }
  
-     public Fluid b(BlockPosition blockposition) {
+     public Fluid getFluid(BlockPosition blockposition) {
 -        if (k(blockposition)) {
 +        if (blockposition.isInvalidYLocation()) { // Paper
              return FluidTypes.a.i();

Spigot-Server-Patches/Optimize-redstone-algorithm.patch

@@ -954,7 +954,7 @@ index 000000000..21d9d6d7e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 80bad6755..3b45489a4 100644
+index 570715ea6..f95464f64 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -0,0 +0,0 @@
@@ -1140,7 +1140,7 @@ index 80bad6755..3b45489a4 100644
                  iblockdata.a(world, blockposition, 0);
                  world.setAir(blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7914f9b60..cdbb247da 100644
+index d202360bd..05256ad3c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -26,7 +26,7 @@ index 6fe3c0ea8..cf523a3e4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e44d8372d..4c5dc39e3 100644
+index 734ee9d8e..e60e8e8fe 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -38,7 +38,7 @@ index e44d8372d..4c5dc39e3 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3768c4779..07b5636f0 100644
+index dc2c143c8..5c7a88ec8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -60,7 +60,7 @@ index 3768c4779..07b5636f0 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a294b4780..0d9ac8778 100644
+index 8c10a0da1..2cb5869ae 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {

Spigot-Server-Patches/POM-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index ccf92b011..f0fc37abf 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -111,6 +111,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
                          </goals>
                          <configuration>
 +                            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
+                             <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                              <relocations>
 -                                <relocation>
 -                                    <pattern>joptsimple</pattern>
@@ -157,7 +158,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 93046379d..674096cab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -0,0 +0,0 @@ public final class Versioning {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5c1f7d72a5..6b58f632bd 100644
+index 7e151439c..0aae80a7f 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 5c1f7d72a5..6b58f632bd 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 3a57315da9..c87304d477 100644
+index 8f4319c80..cf73a6d1f 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -32,7 +32,7 @@ index 3a57315da9..c87304d477 100644
                  double d1 = entityhuman.locY - this.locY;
                  double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 850569f6b7..f958bd5bac 100644
+index 850569f6b..f958bd5ba 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -0,0 +0,0 @@ public class EntitySilverfish extends EntityMonster {
@@ -45,7 +45,7 @@ index 850569f6b7..f958bd5bac 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 8b87146885..601d4c62d4 100644
+index afe039905..ff564508f 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -0,0 +0,0 @@ public final class SpawnerCreature {
@@ -58,7 +58,7 @@ index 8b87146885..601d4c62d4 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9251e0c83c..739e19bb14 100644
+index e1e931406..c378df796 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData;
@@ -79,7 +79,7 @@ index 9251e0c83c..739e19bb14 100644
  
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b5afd5d1c7..47da00948b 100644
+index b5afd5d1c..47da00948 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Prevent-Auto-Save-if-Save-Queue-is-full.patch

@@ -23,7 +23,7 @@ index 0d456bcba..40746c13e 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 69219b13a..09c81e9ab 100644
+index 27bed54d2..917f57ced 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -41,7 +41,7 @@ index 69219b13a..09c81e9ab 100644
                  Chunk chunk = (Chunk) objectiterator.next();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 695044b1b..e86d47a05 100644
+index 8fe4c6fec..a2c3c066b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {

Spigot-Server-Patches/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch

@@ -4,32 +4,20 @@ Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4e8eb137a..479a84a25 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
-         }
-     }
- 
-+    public Fluid getFluid(BlockPosition blockposition) { return b(blockposition); } // Paper - OBFHELPER
-     public Fluid b(BlockPosition blockposition) {
-         return this.b(blockposition.getX(), blockposition.getY(), blockposition.getZ());
-     }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index 9c72848f1..d007d0387 100644
+index 2b15aa6c9..3ca32123b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
      private final Block f;
-     private final EntityInsentient g;
+     private final EntityInsentient entity;
      private int h;
 +    private World world; // Paper
  
      public PathfinderGoalRemoveBlock(Block block, EntityCreature entitycreature, double d0, int i) {
          super(entitycreature, d0, 24, i);
          this.f = block;
-         this.g = entitycreature;
+         this.entity = entitycreature;
 +        this.world = entitycreature.world; // Paper
      }
  
@@ -65,7 +53,7 @@ index 9c72848f1..d007d0387 100644
          return block == this.f && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index 800e0046a..bfa6c2eef 100644
+index f252ef243..bfa6c2eef 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -0,0 +0,0 @@ public class RandomPositionGenerator {
@@ -80,32 +68,31 @@ index 800e0046a..bfa6c2eef 100644
      }
  
      private static boolean b(BlockPosition blockposition, EntityCreature entitycreature) {
--        return entitycreature.world.b(blockposition).a(TagsFluid.WATER);
+-        return entitycreature.world.getFluid(blockposition).a(TagsFluid.WATER);
 +        Fluid fluid = entitycreature.world.getFluidIfLoaded(blockposition); // Paper
 +        return fluid != null && fluid.a(TagsFluid.WATER); // Paper
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a5c655155..016d50d3c 100644
+index 5fe4734e3..eabf50e24 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
+             return chunk.getType(blockposition);
          }
      }
- 
 +    // Paper start
 +    public Fluid getFluidIfLoaded(BlockPosition blockposition) {
 +        if (blockposition.isInvalidYLocation()) { // Paper
 +            return getFluid(blockposition);
 +        } else {
 +            Chunk chunk = this.getChunkIfLoaded(blockposition);
-+
+ 
 +            return chunk != null ? chunk.getFluid(blockposition) : null;
 +        }
 +    }
 +    // Paper end
-+    public Fluid getFluid(BlockPosition blockposition) { return b(blockposition); } // Paper - OBFHELPER
-     public Fluid b(BlockPosition blockposition) {
+     public Fluid getFluid(BlockPosition blockposition) {
          if (blockposition.isInvalidYLocation()) { // Paper
              return FluidTypes.a.i();
 --

Spigot-Server-Patches/Prevent-chunk-loading-from-Fluid-Flowing.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent chunk loading from Fluid Flowing
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index b7006b2cb..05e407f76 100644
+index 8a6f79908..c1ed05d9e 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -0,0 +0,0 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -16,7 +16,7 @@ index b7006b2cb..05e407f76 100644
 +                IBlockData iblockdata1 = generatoraccess.getTypeIfLoaded(blockposition1); // Paper
 +                if (iblockdata1 == null) continue; // Paper
  
-                 if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.b(blockposition1), fluid1.c())) {
+                 if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.getFluid(blockposition1), fluid1.c())) {
                      // CraftBukkit start
 @@ -0,0 +0,0 @@ public abstract class FluidTypeFlowing extends FluidType {
          while (iterator.hasNext()) {

Spigot-Server-Patches/Prevent-rayTrace-from-loading-chunks.patch

@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 027871c00..00773a9af 100644
+index 747fda044..bdbacae29 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -17,7 +17,7 @@ index 027871c00..00773a9af 100644
 -                IBlockData iblockdata = this.getType(blockposition);
 +                IBlockData iblockdata = this.getTypeIfLoaded(blockposition); // Paper
 +                if (iblockdata == null) return null; // Paper
-                 Fluid fluid = this.b(blockposition);
+                 Fluid fluid = this.getFluid(blockposition);
                  boolean flag2;
                  boolean flag3;
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -27,7 +27,7 @@ index 027871c00..00773a9af 100644
 -                    IBlockData iblockdata1 = this.getType(blockposition);
 +                    IBlockData iblockdata1 = this.getTypeIfLoaded(blockposition); // Paper
 +                    if (iblockdata1 == null) return null; // Paper
-                     Fluid fluid1 = this.b(blockposition);
+                     Fluid fluid1 = this.getFluid(blockposition);
  
                      if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
 --

Spigot-Server-Patches/Properly-fix-item-duplication-bug.patch

@@ -6,7 +6,7 @@ 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 891b804a6..edef46ac3 100644
+index c2957ad2e..a615d7867 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index 891b804a6..edef46ac3 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cd8c36471..5584ef71f 100644
+index 6530b6be8..553f76b81 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/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 f9e6c2125..ff03755bc 100644
+index 30d5c1734..e204dbe21 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b357cb2077..b047e8e8b1 100644
+index 96e3d20e3..4aa8e85ab 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index b357cb2077..b047e8e8b1 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 686b356f0d..225ecce71a 100644
+index 44ed34174..c1ede0651 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 64a8c6308c..9614348157 100644
+index 86c6beefe..d6333d9bb 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,7 +62,7 @@ index 64a8c6308c..9614348157 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index be00d79e85..755d288ed5 100644
+index be00d79e8..755d288ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -0,0 +0,0 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {

Spigot-Server-Patches/Slime-Pathfinder-Events.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Slime Pathfinder Events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index e913accd..54c5f746 100644
+index f92bf02b8..81966542e 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -0,0 +0,0 @@
@@ -21,8 +21,8 @@ index e913accd..54c5f746 100644
 +import org.bukkit.entity.Slime;
 +// Paper end
  // CraftBukkit start
- import org.bukkit.craftbukkit.event.CraftEventFactory;
- import org.bukkit.event.entity.EntityTransformEvent;
+ import java.util.ArrayList;
+ import java.util.List;
 @@ -0,0 +0,0 @@ public class EntitySlime extends EntityInsentient implements IMonster {
          super.b(nbttagcompound);
          nbttagcompound.setInt("Size", this.getSize() - 1);
@@ -145,7 +145,7 @@ index e913accd..54c5f746 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index 18e7ef80..8403c1e0 100644
+index 18e7ef80a..8403c1e01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime {

Spigot-Server-Patches/Timings-v2.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 0000000000..66d02e048b
+index 000000000..66d02e048
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +0,0 @@
@@ -144,7 +144,7 @@ index 0000000000..66d02e048b
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 0000000000..145cb274b0
+index 000000000..145cb274b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +0,0 @@
@@ -253,7 +253,7 @@ index 0000000000..145cb274b0
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 87a7b69800..2f17e5219c 100644
+index 87a7b6980..2f17e5219 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ import java.util.concurrent.TimeUnit;
@@ -297,7 +297,7 @@ index 87a7b69800..2f17e5219c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index dfcb285df5..bb8b450ac4 100644
+index b9645c669..fb7688e9e 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -0,0 +0,0 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index dfcb285df5..bb8b450ac4 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e634325ba8..68ba638c6b 100644
+index 6675bc5cc..f929ce02e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index e634325ba8..68ba638c6b 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 85a065f039..4b8b77710b 100644
+index f0d926256..ca18901df 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -0,0 +0,0 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -357,7 +357,7 @@ index 85a065f039..4b8b77710b 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5819e86f32..7239f54377 100644
+index b859a5b9e..60abc5f28 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -398,7 +398,7 @@ index 5819e86f32..7239f54377 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 71c0e069a6..e53e40e439 100644
+index 3bf55a054..179769323 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@
@@ -445,7 +445,7 @@ index 71c0e069a6..e53e40e439 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index b7cdc495a3..8b9b076ded 100644
+index cc9e8465c..1bd3a0f77 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -0,0 +0,0 @@ public class CustomFunction {
@@ -472,7 +472,7 @@ index b7cdc495a3..8b9b076ded 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 4d7e151793..40ff72f725 100644
+index 15ab4f0e4..1004e084c 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -0,0 +0,0 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -485,7 +485,7 @@ index 4d7e151793..40ff72f725 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7f56df0b66..b488178d5b 100644
+index 73a326684..a575ff529 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Level;
@@ -538,7 +538,7 @@ index 7f56df0b66..b488178d5b 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fde9d4d517..c765b5cf32 100644
+index f05a9ebab..8b1e0448b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ import org.bukkit.command.CommandSender;
@@ -577,7 +577,7 @@ index fde9d4d517..c765b5cf32 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 03cd1db365..dec9d2d08c 100644
+index 2a1e3c801..7f95652bd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -653,7 +653,7 @@ index 03cd1db365..dec9d2d08c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index ae31935c48..70c9b1f50c 100644
+index ae31935c4..70c9b1f50 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -0,0 +0,0 @@ public class EntityTracker {
@@ -684,7 +684,7 @@ index ae31935c48..70c9b1f50c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bdbd24b6b5..2d812b0242 100644
+index 04c5c1796..b99ed185f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@
@@ -837,7 +837,7 @@ index bdbd24b6b5..2d812b0242 100644
          this.methodProfiler.e();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 15194bd635..12a8fec29a 100644
+index 384f4f45b..1dfdc5d70 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -0,0 +0,0 @@
@@ -848,7 +848,7 @@ index 15194bd635..12a8fec29a 100644
  import com.google.common.collect.ComparisonChain;
  import com.google.common.collect.Lists;
 @@ -0,0 +0,0 @@ public class PlayerChunkMap {
-         PlayerChunk playerchunk;
+         int j;
  
          if (i - this.k > 8000L) {
 +            try (Timing ignored = world.timings.doChunkMapUpdate.startTiming()) { // Paper
@@ -931,7 +931,7 @@ index 15194bd635..12a8fec29a 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 358e7429b3..784b62c7c8 100644
+index 539e6d3c9..67c993795 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.CraftingInventory;
@@ -986,7 +986,7 @@ index 358e7429b3..784b62c7c8 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 616797dc6e..3a5daf6705 100644
+index 616797dc6..3a5daf670 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -0,0 +0,0 @@
@@ -1007,7 +1007,7 @@ index 616797dc6e..3a5daf6705 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 17b4245417..85947fb678 100644
+index 39f149a81..597ad7d40 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@
@@ -1031,7 +1031,7 @@ index 17b4245417..85947fb678 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index a07895935e..ee5c2421bb 100644
+index a07895935..ee5c2421b 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -0,0 +0,0 @@ public class TickListServer<T> implements TickList<T> {
@@ -1085,7 +1085,7 @@ index a07895935e..ee5c2421bb 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c69209497b..68ac014aab 100644
+index c69209497..68ac014aa 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -0,0 +0,0 @@ import javax.annotation.Nullable;
@@ -1105,7 +1105,7 @@ index c69209497b..68ac014aab 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 433d0ad96a..759fa98c45 100644
+index 44b381120..119e1facc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@
@@ -1163,7 +1163,7 @@ index 433d0ad96a..759fa98c45 100644
 +        timings.entityRemoval.stopTiming(); // Paper
          this.methodProfiler.c("regular");
  
-         CrashReportSystemDetails crashreportsystemdetails1;
+         CrashReport crashreport1;
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
          timings.entityTick.startTiming(); // Spigot
          guardEntityList = true; // Spigot
@@ -1220,7 +1220,7 @@ index 433d0ad96a..759fa98c45 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 74a61f300c..d10fb980dd 100644
+index ee68983f6..435c54da1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@
@@ -1319,7 +1319,7 @@ index 74a61f300c..d10fb980dd 100644
          Iterator iterator = this.server.getWorlds().iterator();
  
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-         this.worldData.c(this.server.aP().c());
+         this.worldData.c(this.server.getBossBattleCustomData().c());
          this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().t());
          this.h().a();
 +        timings.worldSaveLevel.stopTiming(); // Paper
@@ -1327,7 +1327,7 @@ index 74a61f300c..d10fb980dd 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1813f3d5a..174605b6e1 100644
+index b524adc7d..9efd620f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ public final class CraftServer implements Server {
@@ -1364,7 +1364,7 @@ index f1813f3d5a..174605b6e1 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 2ab4b11a8d..0000000000
+index 2ab4b11a8..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
@@ -1542,7 +1542,7 @@ index 2ab4b11a8d..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f06..52a8c48fa4 100644
+index 413dd35f0..52a8c48fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -0,0 +0,0 @@
@@ -1578,7 +1578,7 @@ index 413dd35f06..52a8c48fa4 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b1a5937b1e..b5afd5d1c7 100644
+index b1a5937b1..b5afd5d1c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1597,7 +1597,7 @@ index b1a5937b1e..b5afd5d1c7 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index b0f1f83728..9dec941fb7 100644
+index 2f5d7a2a6..311c4f5ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;
@@ -1664,7 +1664,7 @@ index b0f1f83728..9dec941fb7 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 3ec0f393ed..7490a187ec 100644
+index 3f55381c1..f32e66010 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.scheduler;
@@ -1746,7 +1746,7 @@ index 3ec0f393ed..7490a187ec 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b78..3d90b34268 100644
+index e52ef47b7..3d90b3426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -0,0 +0,0 @@ import org.bukkit.util.CachedServerIcon;
@@ -1758,7 +1758,7 @@ index e52ef47b78..3d90b34268 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c1071c92ee..a99c0cea0f 100644
+index c1071c92e..a99c0cea0 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -0,0 +0,0 @@ import net.minecraft.server.EntityWither;

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 67b4d576a9..02c52958c8 100644
+index 67b4d576a..02c52958c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 67b4d576a9..02c52958c8 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b047e8e8b1..b9e6a18293 100644
+index 4aa8e85ab..d5adc0a24 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {

Spigot-Server-Patches/Turtle-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Turtle API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 70cf407dc..2c1db9b78 100644
+index db221a6b5..37fc10fba 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
@@ -34,43 +34,43 @@ index 70cf407dc..2c1db9b78 100644
  
 +    public boolean hasEgg() { return dy(); } // Paper - OBFHELPER
      public boolean dy() {
-         return ((Boolean) this.datawatcher.get(EntityTurtle.bE)).booleanValue();
+         return (Boolean) this.datawatcher.get(EntityTurtle.bE);
      }
  
 +    public void setHasEgg(boolean hasEgg) { s(hasEgg); } // Paper - OBFHELPER
      private void s(boolean flag) {
-         this.datawatcher.set(EntityTurtle.bE, Boolean.valueOf(flag));
+         this.datawatcher.set(EntityTurtle.bE, flag);
      }
  
 +    public boolean isDigging() { return dz(); } // Paper - OBFHELPER
      public boolean dz() {
-         return ((Boolean) this.datawatcher.get(EntityTurtle.bG)).booleanValue();
+         return (Boolean) this.datawatcher.get(EntityTurtle.bG);
      }
  
 +    public void setDigging(boolean digging) { t(digging); } // Paper - OBFHELPER
      private void t(boolean flag) {
          this.bK = flag ? 1 : 0;
-         this.datawatcher.set(EntityTurtle.bG, Boolean.valueOf(flag));
+         this.datawatcher.set(EntityTurtle.bG, flag);
      }
  
 +    public boolean isGoingHome() { return dC(); } // Paper - OBFHELPER
      private boolean dC() {
-         return ((Boolean) this.datawatcher.get(EntityTurtle.bI)).booleanValue();
+         return (Boolean) this.datawatcher.get(EntityTurtle.bI);
      }
  
 +    public void setGoingHome(boolean goingHome) { u(goingHome); } // Paper - OBFHELPER
      private void u(boolean flag) {
-         this.datawatcher.set(EntityTurtle.bI, Boolean.valueOf(flag));
+         this.datawatcher.set(EntityTurtle.bI, flag);
      }
  
 +    public boolean isTravelling() { return dH(); } // Paper - OBFHELPER
      private boolean dH() {
-         return ((Boolean) this.datawatcher.get(EntityTurtle.bJ)).booleanValue();
+         return (Boolean) this.datawatcher.get(EntityTurtle.bJ);
      }
  
 +    public void setTravelling(boolean travelling) { v(travelling); } // Paper - OBFHELPER
      private void v(boolean flag) {
-         this.datawatcher.set(EntityTurtle.bJ, Boolean.valueOf(flag));
+         this.datawatcher.set(EntityTurtle.bJ, flag);
      }
 @@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
  
@@ -88,9 +88,8 @@ index 70cf407dc..2c1db9b78 100644
 +                    com.destroystokyo.paper.event.entity.TurtleLayEggEvent layEggEvent = new com.destroystokyo.paper.event.entity.TurtleLayEggEvent((org.bukkit.entity.Turtle) this.f.getBukkitEntity(), MCUtil.toLocation(this.f.world, this.d.up()), eggCount);
 +                    if (layEggEvent.callEvent() && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.f, this.d.up(), Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, layEggEvent.getEggCount())).isCancelled()) {
                      world.a((EntityHuman) null, blockposition, SoundEffects.ENTITY_TURTLE_LAY_EGG, SoundCategory.BLOCKS, 0.3F, 0.9F + world.random.nextFloat() * 0.2F);
--                    world.setTypeAndData(this.d.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, Integer.valueOf(this.f.random.nextInt(4) + 1)), 3);
+-                    world.setTypeAndData(this.d.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, this.f.random.nextInt(4) + 1), 3);
 +                    world.setTypeAndData(this.d.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, layEggEvent.getEggCount()), 3);
-+                    // Paper end
                      }
                      // CraftBukkit end
                      this.f.s(false);

Spigot-Server-Patches/Use-EntityTypes-for-living-entities.patch

@@ -18,7 +18,7 @@ index 5a0cc6d05..d385f647e 100644
              entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
              world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
 diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
-index f7ea9f9b8..dfa3bd685 100644
+index 75622fbdf..265369984 100644
 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 @@ -0,0 +0,0 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@@ -40,12 +40,12 @@ index f7ea9f9b8..dfa3bd685 100644
                  entityirongolem.setPlayerCreated(true);
                  entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index 924d15649..9e9fa7d58 100644
+index d2cc6bbe2..b180772ae 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -0,0 +0,0 @@ public class BlockTurtleEgg extends Block {
                  if (!world.isClientSide) {
-                     for (int j = 0; j < ((Integer) iblockdata.get(BlockTurtleEgg.b)).intValue(); ++j) {
+                     for (int j = 0; j < (Integer) iblockdata.get(BlockTurtleEgg.b); ++j) {
                          world.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata));
 -                        EntityTurtle entityturtle = new EntityTurtle(world);
 +                        EntityTurtle entityturtle = EntityTypes.TURTLE.create(world); // Paper
@@ -53,7 +53,7 @@ index 924d15649..9e9fa7d58 100644
                          entityturtle.setAgeRaw(-24000);
                          entityturtle.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
-index 7904b1262..38fc40e50 100644
+index 93bf32dc1..e6063bb46 100644
 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
 @@ -0,0 +0,0 @@ public class BlockWitherSkull extends BlockSkull {
@@ -66,7 +66,7 @@ index 7904b1262..38fc40e50 100644
  
                  entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index f4a8a4b4d..3d5801dd8 100644
+index 67808446c..89bb2e768 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -0,0 +0,0 @@ public class EnderDragonBattle {
@@ -75,11 +75,11 @@ index f4a8a4b4d..3d5801dd8 100644
          this.d.getChunkAtWorldCoords(new BlockPosition(0, 128, 0));
 -        EntityEnderDragon entityenderdragon = new EntityEnderDragon(this.d);
 +        EntityEnderDragon entityenderdragon = EntityTypes.ENDER_DRAGON.create(this.d); // Paper
- 
          entityenderdragon.getDragonControllerManager().setControllerPhase(DragonControllerPhase.a);
          entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
+         this.d.addEntity(entityenderdragon);
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index efb728d04..3bfbf4752 100644
+index afbcfab55..b1af04726 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -0,0 +0,0 @@ public class EntityChicken extends EntityAnimal {
@@ -92,7 +92,7 @@ index efb728d04..3bfbf4752 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index b2e50f853..9c7bf12b8 100644
+index 6bb80975e..180de2144 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -0,0 +0,0 @@ public class EntityCow extends EntityAnimal {
@@ -105,7 +105,7 @@ index b2e50f853..9c7bf12b8 100644
  
      public float getHeadHeight() {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index c82b5f3ab..ba53e9b0b 100644
+index 46f29272e..1d3b7edb3 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
 @@ -0,0 +0,0 @@ public class EntityEnderPearl extends EntityProjectile {
@@ -200,13 +200,13 @@ index 774e4d641..0cf53b69f 100644
          EntityLlama entityllama2 = (EntityLlama)entityageable;
          int i = this.random.nextInt(Math.max(this.getStrength(), entityllama2.getStrength())) + 1;
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 8ba9f3bb1..c12b37f52 100644
+index dab644930..737289588 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -0,0 +0,0 @@ public class EntityMushroomCow extends EntityCow {
              this.world.addParticle(Particles.u, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, 0.0D, 0.0D, 0.0D);
              if (!this.world.isClientSide) {
-                 this.die();
+                 // this.die(); // CraftBukkit - moved down
 -                EntityCow entitycow = new EntityCow(this.world);
 +                EntityCow entitycow = EntityTypes.COW.create(world); // Paper
  
@@ -222,7 +222,7 @@ index 8ba9f3bb1..c12b37f52 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index d2e25f04b..90a7e00a0 100644
+index 2a5a5516a..58518a509 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -0,0 +0,0 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -244,7 +244,7 @@ index d2e25f04b..90a7e00a0 100644
                  entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                  entityocelot.setAgeRaw(-24000);
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 23668ada3..6295cd95d 100644
+index 30306256a..4d9e8c378 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -0,0 +0,0 @@ public class EntityPig extends EntityAnimal {
@@ -254,8 +254,8 @@ index 23668ada3..6295cd95d 100644
 -            EntityPigZombie entitypigzombie = new EntityPigZombie(this.world);
 +            EntityPigZombie entitypigzombie = EntityTypes.ZOMBIE_PIGMAN.create(world); // Paper
  
-             // Paper start
-             if (CraftEventFactory.callEntityZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
+             entitypigzombie.setSlot(EnumItemSlot.MAINHAND, new ItemStack(Items.GOLDEN_SWORD));
+             entitypigzombie.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
 @@ -0,0 +0,0 @@ public class EntityPig extends EntityAnimal {
      }
  
@@ -279,7 +279,7 @@ index b9124a5b0..cb3e45f14 100644
  
      public boolean f(ItemStack var1) {
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index b8ca53003..747409af0 100644
+index a10de4e88..ea101bee9 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -0,0 +0,0 @@ public class EntityRabbit extends EntityAnimal {
@@ -292,7 +292,7 @@ index b8ca53003..747409af0 100644
  
          if (this.random.nextInt(20) != 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index 4a9a9f9da..db4c3aa60 100644
+index caf442610..2b50bc2ea 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -0,0 +0,0 @@ public class EntitySheep extends EntityAnimal {
@@ -305,7 +305,7 @@ index 4a9a9f9da..db4c3aa60 100644
          entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
          return entitysheep1;
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index 761c94bdf..ffbd572dd 100644
+index 361c7831e..e46340e66 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -0,0 +0,0 @@ public class EntitySpider extends EntityMonster {
@@ -318,7 +318,7 @@ index 761c94bdf..ffbd572dd 100644
              entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
              entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 2c1db9b78..0d88314de 100644
+index 37fc10fba..98268145e 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -0,0 +0,0 @@ public class EntityTurtle extends EntityAnimal {
@@ -343,7 +343,7 @@ index 6b6fbfd79..29d5ef4c1 100644
      public T a(World world) {
          return this.aT.apply(world); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 868d24830..fbf78edd3 100644
+index e4a570e01..0de37ceb3 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -365,7 +365,7 @@ index 868d24830..fbf78edd3 100644
              // Paper start
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index af9aef76f..68db6af62 100644
+index 9a52d33d6..878eac112 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -0,0 +0,0 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -378,7 +378,7 @@ index af9aef76f..68db6af62 100644
  
          if (uuid != null) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 4b326bf6a..69a12bab3 100644
+index 823d4be7f..2d87dca68 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
@@ -407,7 +407,7 @@ index 4b326bf6a..69a12bab3 100644
 +            EntityZombieVillager entityzombievillager = EntityTypes.ZOMBIE_VILLAGER.create(world); // Paper
  
              entityzombievillager.u(entityvillager);
-             this.world.kill(entityvillager);
+             // this.world.kill(entityvillager); // CraftBukkit - moved down
 @@ -0,0 +0,0 @@ public class EntityZombie extends EntityMonster {
                          this.startRiding(entitychicken);
                      }
@@ -431,7 +431,7 @@ index 85d402965..0cca7b6d5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 0e5dd1116..c11e2745a 100644
+index ab1b3ab5e..dbb833e49 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -0,0 +0,0 @@ public class EntityZombieVillager extends EntityZombie {
@@ -457,7 +457,7 @@ index 9e4078148..a4fab5c23 100644
  
                          entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 413188e97..476b840ae 100644
+index 5ddf66eef..bb7e072ee 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -0,0 +0,0 @@ public class MobSpawnerPhantom {
@@ -527,7 +527,7 @@ index d53911594..83f55adba 100644
                  entityshulker.g(blockposition);
                  generatoraccess.addEntity(entityshulker);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
-index 50fe0e16b..ceb37aab4 100644
+index a542e581c..a64fef39d 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 @@ -0,0 +0,0 @@ public class WorldGenFeatureOceanRuinPieces {
@@ -580,7 +580,7 @@ index 6ab249ee7..c9a17e332 100644
              for(WorldGenMonumentPieces.WorldGenMonumentStateTracker worldgenmonumentpieces$worldgenmonumentstatetracker4 : aworldgenmonumentpieces$worldgenmonumentstatetracker) {
                  if (worldgenmonumentpieces$worldgenmonumentstatetracker4 != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
-index e327e2a28..c63b535ee 100644
+index 706e2b7e1..20630784a 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 @@ -0,0 +0,0 @@ public class WorldGenVillagePieces {
@@ -602,18 +602,18 @@ index e327e2a28..c63b535ee 100644
                          entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
                          entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
 diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
-index a05e0657b..7062b0cec 100644
+index efb0379ce..3d8193c47 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 @@ -0,0 +0,0 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
  
-                 if (structureboundingbox.b((BaseBlockPosition) (new BlockPosition(i, j, k)))) {
+                 if (structureboundingbox.b((BaseBlockPosition) (new BlockPosition(j, i, k)))) {
                      this.e = true;
 -                    EntityWitch entitywitch = new EntityWitch(generatoraccess.getMinecraftWorld());
 +                    EntityWitch entitywitch = EntityTypes.WITCH.create(generatoraccess.getMinecraftWorld()); // Paper
  
                      entitywitch.di();
-                     entitywitch.setPositionRotation((double) i + 0.5D, (double) j, (double) k + 0.5D, 0.0F, 0.0F);
+                     entitywitch.setPositionRotation((double) j + 0.5D, (double) i, (double) k + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 index ee401980f..9ca9306d0 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
@@ -686,7 +686,7 @@ index ee401980f..9ca9306d0 100644
                  entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
                  entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity)null, (NBTTagCompound)null);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 818e4c376..4f9029c33 100644
+index 899c7f5f7..aff5a62e5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index bb80459af..6127bdcad 100644
+index f0fc37abf..ea08d7d98 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index b488178d5..ae77164a3 100644
+index a575ff529..908127630 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index b488178d5..ae77164a3 100644
          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 21d9218c5..64a3dafe6 100644
+index a1a574023..ce1805062 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ import org.apache.commons.lang3.Validate;
@@ -243,7 +243,7 @@ index 21d9218c5..64a3dafe6 100644
  
      public KeyPair E() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 057feebd1..3dcceb2fe 100644
+index 3f96443eb..fb9b0835b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
@@ -257,7 +257,7 @@ index 057feebd1..3dcceb2fe 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b671e17c8..7d7f7aa6f 100644
+index ba702591a..97fa98d2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ import java.nio.ByteBuffer;
@@ -285,7 +285,7 @@ index b671e17c8..7d7f7aa6f 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bc7bcaada..db725a0bc 100644
+index 5c62e990a..b174a4efa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ import java.util.logging.Logger;

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e0cd7bd857..801c3fb8e0 100644
+index 6c427e9aa..f13fa7fff 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index e0cd7bd857..801c3fb8e0 100644
      protected int k;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 85d364b8f4..ff6c8e2b55 100644
+index 85d364b8f..ff6c8e2b5 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -0,0 +0,0 @@ public class ItemBlock extends Item {
@@ -32,7 +32,7 @@ index 85d364b8f4..ff6c8e2b55 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 1ea8464aeb..35b08a5f99 100644
+index c6ec1a782..6c61718b2 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -0,0 +0,0 @@ public abstract class VoxelShape {
@@ -44,7 +44,7 @@ index 1ea8464aeb..35b08a5f99 100644
          if (this.isEmpty()) {
              throw new UnsupportedOperationException("No bounds for empty shape.");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fa94e41f0f..ad1011a22a 100644
+index 7f23a8e2e..811311e9e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -86,7 +86,7 @@ index fa94e41f0f..ad1011a22a 100644
          if (voxelshape.isEmpty()) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 630a43bc41..da779ecb3a 100644
+index b220895c2..672c32858 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {

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

@@ -6,14 +6,14 @@ 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index 5600223d9..173712659 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
--        return String.format(Locale.ROOT, "%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)});
+-        return String.format(Locale.ROOT, "%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), this.id, this.world == null ? "~NULL~" : this.world.getWorldData().getName(), this.locX, this.locY, this.locZ});
 +        return String.format(Locale.ROOT, "%s[\'%s\'/%d, uuid=\'%s\', l=\'%s\', x=%.2f, y=%.2f, z=%.2f, cx=%d, cz=%d, tl=%d, v=%b, d=%b]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.uniqueID.toString(), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ), getChunkX(), getChunkZ(), this.ticksLived, this.valid, this.dead}); // Paper - add more information
      }
  

Spigot-Server-Patches/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 32b90f30d..78ec842f2 100644
+index e4c78c676..ab24ff871 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 32b90f30d..78ec842f2 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 287001558..75dc93cd1 100644
+index 6aa3a462f..c25a89111 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -90,11 +90,11 @@ index 287001558..75dc93cd1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a845856af..44e0f1fe4 100644
+index 34b649dad..4dd24e1d7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
-         return (((Byte) this.datawatcher.get(EntityLiving.aw)).byteValue() & 4) != 0;
+         return ((Byte) this.datawatcher.get(EntityLiving.aw) & 4) != 0;
      }
  
 -    public void stopRiding() {
@@ -110,7 +110,7 @@ index a845856af..44e0f1fe4 100644
              this.A(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4490b6325..342cdb4a9 100644
+index 1b47d7bd4..7b8dbd00c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {