Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Bukkit Changes:
f52c70ab Fix incorrect nullability in MultipleFacing
6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles
97aeae56 Add set/isAware to disable Vanilla AI components of a Mob

CraftBukkit Changes:
fba9f487 Improve legacy conversion of some materials that changed post flattening
b1ba8749 Move Bukkit.Aware loading/saving to correct location
f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles
689f429c #634: Cross platform patch scripts
ab85433d Add set/isAware to disable Vanilla AI components of a Mob

Spigot Changes:
8faa8b45 Rebuild patches

Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From 6edea23ef413c2a6d73d490367a10019e2693bfa Mon Sep 17 00:00:00 2001
+From fce1924845cf533a2868e51bbd31ad9481d28349 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a5ea8f44..f5969cad 100644
+index 88a93627..7d8f2447 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -500,4 +500,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -504,4 +504,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param <T> the type of the passed value
       */
      <T> void setMemory(@NotNull MemoryKey<T> memoryKey, @Nullable T memoryValue);
@@ -29,5 +29,5 @@ index a5ea8f44..f5969cad 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch

@@ -1,14 +1,14 @@
-From ec42ead9c4a6ccdeacfa79e586ab6193fa601137 Mon Sep 17 00:00:00 2001
+From 4f025823575c29539c54a5d3717c8fef62505445 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 7e8fc5b3..3e6da797 100644
+index 371d342a..7f1f3dc6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -527,5 +527,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);
@@ -29,5 +29,5 @@ index 7e8fc5b3..3e6da797 100644
      // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,4 +1,4 @@
-From 72f2d9e3b8b64242408591a1b4f30517ca37fc18 Mon Sep 17 00:00:00 2001
+From fe8992128dc14ba54cd5cbdb4f5fc8ce0ed8cb6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -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/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 3e6da797..d170149d 100644
+index 7f1f3dc6..6df0c2cc 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
@@ -17,7 +17,7 @@ index 3e6da797..d170149d 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -537,5 +538,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -541,5 +542,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);
@@ -51,5 +51,5 @@ index 3e6da797..d170149d 100644
      // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-API-Patches/0191-Entity-Jump-API.patch

@@ -1,4 +1,4 @@
-From 282dc16c61aeacfab2e8ab1f38b75a6975f7701f Mon Sep 17 00:00:00 2001
+From c3a9c52e09a66c5d9afc3f9a48959a7aad908d40 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:26:18 -0600
 Subject: [PATCH] Entity Jump API
@@ -57,10 +57,10 @@ index 00000000..f0067c2e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 240f276c..77f4246d 100644
+index 9bc026ab..e69702e6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -680,5 +680,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -684,5 +684,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
       */
      boolean isHandRaised();

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

@@ -1,4 +1,4 @@
-From c750b5ba92a117b69ce896b1147e65a79044a244 Mon Sep 17 00:00:00 2001
+From 8d910962064780e9aa7660be1cf0ba0a1020275c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -6,7 +6,7 @@ Subject: [PATCH] MC Utils
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java b/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java
 new file mode 100644
-index 000000000..4029dc68c
+index 0000000000..4029dc68cf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java
 @@ -0,0 +1,68 @@
@@ -80,7 +80,7 @@ index 000000000..4029dc68c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java
 new file mode 100644
-index 000000000..968c9ed32
+index 0000000000..968c9ed328
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java
 @@ -0,0 +1,156 @@
@@ -242,7 +242,7 @@ index 000000000..968c9ed32
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java
 new file mode 100644
-index 000000000..07685b6bd
+index 0000000000..07685b6bd5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java
 @@ -0,0 +1,172 @@
@@ -420,7 +420,7 @@ index 000000000..07685b6bd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java
 new file mode 100644
-index 000000000..4ec248adb
+index 0000000000..4ec248adb6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java
 @@ -0,0 +1,127 @@
@@ -553,7 +553,7 @@ index 000000000..4ec248adb
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java
 new file mode 100644
-index 000000000..f3cb346c9
+index 0000000000..f3cb346c9d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java
 @@ -0,0 +1,126 @@
@@ -685,7 +685,7 @@ index 000000000..f3cb346c9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java
 new file mode 100644
-index 000000000..c2f7e4ca0
+index 0000000000..c2f7e4ca0f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java
 @@ -0,0 +1,126 @@
@@ -817,7 +817,7 @@ index 000000000..c2f7e4ca0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
 new file mode 100644
-index 000000000..5a44bc644
+index 0000000000..5a44bc644b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
 @@ -0,0 +1,389 @@
@@ -1212,7 +1212,7 @@ index 000000000..5a44bc644
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java
 new file mode 100644
-index 000000000..8a552a87a
+index 0000000000..8a552a87ab
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java
 @@ -0,0 +1,27 @@
@@ -1245,7 +1245,7 @@ index 000000000..8a552a87a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java
 new file mode 100644
-index 000000000..5f2d88797
+index 0000000000..5f2d88797d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java
 @@ -0,0 +1,289 @@
@@ -1540,7 +1540,7 @@ index 000000000..5f2d88797
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
 new file mode 100644
-index 000000000..4d74a7a90
+index 0000000000..4d74a7a908
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
 @@ -0,0 +1,65 @@
@@ -1610,7 +1610,7 @@ index 000000000..4d74a7a90
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockAccessAir.java b/src/main/java/net/minecraft/server/BlockAccessAir.java
-index eff6ebcd3..30cbfc8ea 100644
+index eff6ebcd30..30cbfc8eac 100644
 --- a/src/main/java/net/minecraft/server/BlockAccessAir.java
 +++ b/src/main/java/net/minecraft/server/BlockAccessAir.java
 @@ -14,6 +14,18 @@ public enum BlockAccessAir implements IBlockAccess {
@@ -1633,7 +1633,7 @@ index eff6ebcd3..30cbfc8ea 100644
      public IBlockData getType(BlockPosition blockposition) {
          return Blocks.AIR.getBlockData();
 diff --git a/src/main/java/net/minecraft/server/BlockDataAbstract.java b/src/main/java/net/minecraft/server/BlockDataAbstract.java
-index 1cf97cefc..2040f1834 100644
+index 1cf97cefc9..2040f18349 100644
 --- a/src/main/java/net/minecraft/server/BlockDataAbstract.java
 +++ b/src/main/java/net/minecraft/server/BlockDataAbstract.java
 @@ -78,6 +78,7 @@ public abstract class BlockDataAbstract<O, S> implements IBlockDataHolder<S> {
@@ -1645,7 +1645,7 @@ index 1cf97cefc..2040f1834 100644
          return this.d.containsKey(iblockstate);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index c88a62f6b..5dbd3e60f 100644
+index c88a62f6b7..5dbd3e60fe 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -120,6 +120,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -1700,7 +1700,7 @@ index c88a62f6b..5dbd3e60f 100644
              this.d = i;
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 55373cae0..af10c18d4 100644
+index 55373cae07..af10c18d44 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger;
@@ -1802,7 +1802,7 @@ index 55373cae0..af10c18d4 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index 11c4d23ba..53c15c1c0 100644
+index 11c4d23ba9..53c15c1c0b 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -8,7 +8,7 @@ public class ChunkCache implements IBlockAccess, ICollisionAccess {
@@ -1836,7 +1836,7 @@ index 11c4d23ba..53c15c1c0 100644
      @Override
      public TileEntity getTileEntity(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index 260644bf0..f2a19acd8 100644
+index 260644bf0b..f2a19acd84 100644
 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 @@ -31,7 +31,9 @@ public class ChunkCoordIntPair {
@@ -1851,7 +1851,7 @@ index 260644bf0..f2a19acd8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e8b7cc06c..4dd804e9c 100644
+index 43d0776f85..f558ae4417 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -23,7 +23,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2003,7 +2003,7 @@ index e8b7cc06c..4dd804e9c 100644
      @Override
      public IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index 7ca3a1d0c..2edd9b871 100644
+index 7ca3a1d0c5..2edd9b8714 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -83,6 +83,7 @@ public class DataBits {
@@ -2015,7 +2015,7 @@ index 7ca3a1d0c..2edd9b871 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java
-index 75ba69886..45403fbe3 100644
+index 75ba698868..45403fbe30 100644
 --- a/src/main/java/net/minecraft/server/DataPalette.java
 +++ b/src/main/java/net/minecraft/server/DataPalette.java
 @@ -4,10 +4,12 @@ import javax.annotation.Nullable;
@@ -2032,7 +2032,7 @@ index 75ba69886..45403fbe3 100644
      T a(int i);
  
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 774a8f543..d5f5a5187 100644
+index 774a8f5434..d5f5a51872 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -11,7 +11,7 @@ import java.util.stream.Collectors;
@@ -2074,7 +2074,7 @@ index 774a8f543..d5f5a5187 100644
          this.a();
          packetdataserializer.writeByte(this.i);
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index fe69161e5..b40c8d2f8 100644
+index fe69161e5b..b40c8d2f83 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -6,6 +6,8 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -2087,10 +2087,10 @@ index fe69161e5..b40c8d2f8 100644
          super(entitytypes, world);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e1398652a..7ee5eb987 100644
+index bdfb173853..0b06fa2b66 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -144,6 +144,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -146,6 +146,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return this.goalTarget;
      }
  
@@ -2099,7 +2099,7 @@ index e1398652a..7ee5eb987 100644
          // CraftBukkit start - fire event
          setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3b1bcf349..1f350e335 100644
+index 3b1bcf3495..1f350e3352 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -129,6 +129,7 @@ public abstract class EntityLiving extends Entity {
@@ -2111,7 +2111,7 @@ index 3b1bcf349..1f350e335 100644
      @Override
      public float getBukkitYaw() {
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 00c3b666d..e5322fbae 100644
+index 00c3b666d7..e5322fbae5 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -5,6 +5,7 @@ import java.util.function.Predicate;
@@ -2123,7 +2123,7 @@ index 00c3b666d..e5322fbae 100644
          super(entitytypes, world);
          this.f = 5;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ce4821092..57ce9bde6 100644
+index ce48210922..57ce9bde64 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -87,6 +87,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2145,7 +2145,7 @@ index ce4821092..57ce9bde6 100644
          this.displayName = this.getName();
          this.canPickUpLoot = true;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index f937b7294..cbf0c2f25 100644
+index f937b72945..cbf0c2f25d 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixUtils;
@@ -2168,7 +2168,7 @@ index f937b7294..cbf0c2f25 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 1890c760f..7e5ece9d5 100644
+index 1890c760f9..7e5ece9d50 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -68,6 +68,15 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -2188,7 +2188,7 @@ index 1890c760f..7e5ece9d5 100644
          this.d.add(r0);
          LockSupport.unpark(this.getThread());
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 3b0877080..0dff02352 100644
+index 3b08770801..0dff023529 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -9,10 +9,24 @@ public interface IBlockAccess {
@@ -2217,7 +2217,7 @@ index 3b0877080..0dff02352 100644
          return this.getType(blockposition).h();
      }
 diff --git a/src/main/java/net/minecraft/server/IOWorker.java b/src/main/java/net/minecraft/server/IOWorker.java
-index c5658c077..b90baef0f 100644
+index c5658c0779..b90baef0f5 100644
 --- a/src/main/java/net/minecraft/server/IOWorker.java
 +++ b/src/main/java/net/minecraft/server/IOWorker.java
 @@ -22,7 +22,7 @@ public class IOWorker implements AutoCloseable {
@@ -2230,7 +2230,7 @@ index c5658c077..b90baef0f 100644
      private boolean g = true;
      private CompletableFuture<Void> h = new CompletableFuture();
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index ba315131e..cbe2aa4c0 100644
+index ba315131e1..cbe2aa4c0a 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -4,6 +4,7 @@ import javax.annotation.Nullable;
@@ -2242,7 +2242,7 @@ index ba315131e..cbe2aa4c0 100644
      IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag);
  
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 75308712d..aa7501d36 100644
+index 75308712d0..aa7501d366 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -37,10 +37,19 @@ import org.bukkit.event.world.StructureGrowEvent;
@@ -2302,7 +2302,7 @@ index 75308712d..aa7501d36 100644
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 000000000..9fa88d79d
+index 0000000000..9fa88d79d8
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +1,386 @@
@@ -2693,7 +2693,7 @@ index 000000000..9fa88d79d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index e85b24a32..75604dbc6 100644
+index e85b24a327..75604dbc69 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -60,7 +60,7 @@ public class NBTTagCompound implements NBTBase {
@@ -2722,7 +2722,7 @@ index e85b24a32..75604dbc6 100644
          return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
      }
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 6700582e3..3ccf16636 100644
+index 6700582e36..3ccf166366 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -159,6 +159,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -2754,7 +2754,7 @@ index 6700582e3..3ccf16636 100644
          public QueuedPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
              this.a = packet;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 81b6f4581..d9574a9ac 100644
+index 81b6f4581f..d9574a9ace 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -2766,7 +2766,7 @@ index 81b6f4581..d9574a9ac 100644
          for (int j = 1; j < 5; ++j) {
              if ((i & -1 << j * 7) == 0) {
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 90223deae..63c4dbd32 100644
+index 90223deae3..63c4dbd327 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -42,6 +42,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -2778,7 +2778,7 @@ index 90223deae..63c4dbd32 100644
                          throw new SkipEncodeException(throwable);
                      } else {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 677e3e5f6..3a1d0deb0 100644
+index 677e3e5f68..3a1d0deb0d 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -17,7 +17,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -2799,7 +2799,7 @@ index 677e3e5f6..3a1d0deb0 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 775359146..3093154bb 100644
+index 775359146f..3093154bb7 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -19,9 +19,9 @@ public class PlayerChunk {
@@ -2971,7 +2971,7 @@ index 775359146..3093154bb 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index b5a3b1001..e24889371 100644
+index 7ad30548e2..93d838ec2d 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -99,6 +99,35 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -3020,7 +3020,7 @@ index b5a3b1001..e24889371 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ba0293512..b257e1c4e 100644
+index 0c496ee0a0..6a681d694e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -3037,7 +3037,7 @@ index ba0293512..b257e1c4e 100644
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
 diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java
-index 08768a3c8..d103cfaac 100644
+index 08768a3c87..d103cfaace 100644
 --- a/src/main/java/net/minecraft/server/PlayerInventory.java
 +++ b/src/main/java/net/minecraft/server/PlayerInventory.java
 @@ -17,7 +17,7 @@ public class PlayerInventory implements IInventory, INamableTileEntity {
@@ -3050,7 +3050,7 @@ index 08768a3c8..d103cfaac 100644
      public final EntityHuman player;
      private ItemStack carried;
 diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java
-index b3824898d..bf4172be5 100644
+index b3824898da..bf4172be52 100644
 --- a/src/main/java/net/minecraft/server/PotionUtil.java
 +++ b/src/main/java/net/minecraft/server/PotionUtil.java
 @@ -110,6 +110,7 @@ public class PotionUtil {
@@ -3062,7 +3062,7 @@ index b3824898d..bf4172be5 100644
          MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry);
  
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 6e65306a2..39339fa27 100644
+index 6e65306a27..39339fa275 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
 @@ -80,6 +80,18 @@ public class ProtoChunk implements IChunkAccess {
@@ -3085,7 +3085,7 @@ index 6e65306a2..39339fa27 100644
      public IBlockData getType(BlockPosition blockposition) {
          int i = blockposition.getY();
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 7b6e0e86b..187c4e0f5 100644
+index 7b6e0e86b0..187c4e0f58 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -88,6 +88,7 @@ public class RegionFile implements AutoCloseable {
@@ -3097,7 +3097,7 @@ index 7b6e0e86b..187c4e0f5 100644
      public synchronized DataInputStream a(ChunkCoordIntPair chunkcoordintpair) throws IOException {
          int i = this.getOffset(chunkcoordintpair);
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
-index 8c123f265..9d0e8c2d4 100644
+index 8c123f265e..9d0e8c2d43 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 @@ -108,6 +108,26 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@@ -3128,7 +3128,7 @@ index 8c123f265..9d0e8c2d4 100644
      public IBlockData getType(BlockPosition blockposition) {
          return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4).getType(blockposition);
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index 4efcb8b59..60948afa4 100644
+index 4efcb8b595..60948afa4e 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -57,6 +57,7 @@ public class RegistryBlockID<T> implements Registry<T> {
@@ -3140,7 +3140,7 @@ index 4efcb8b59..60948afa4 100644
          return this.b.size();
      }
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 7b92ecfff..7e224ebef 100644
+index 7b92ecfff9..7e224ebeff 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -58,7 +58,7 @@ public class SystemUtils {
@@ -3153,7 +3153,7 @@ index 7b92ecfff..7e224ebef 100644
  
      public static long getTimeMillis() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f0deeb3d2..304dfac06 100644
+index f0deeb3d28..304dfac061 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -22,6 +22,7 @@ import org.bukkit.craftbukkit.SpigotTimings; // Spigot
@@ -3217,7 +3217,7 @@ index f0deeb3d2..304dfac06 100644
  
          return this.setTypeAndData(blockposition, fluid.getBlockData(), 3 | (flag ? 64 : 0));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 32f8f2aed..2aaf679df 100644
+index d5014abc9d..8a5ac6f69b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -973,6 +973,7 @@ public class WorldServer extends World {
@@ -3237,7 +3237,7 @@ index 32f8f2aed..2aaf679df 100644
  
          this.getScoreboard().a(entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index e181df6f4..4a9132c70 100644
+index e181df6f4d..4a9132c701 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -85,6 +85,7 @@ public final class CraftItemStack extends ItemStack {
@@ -3249,7 +3249,7 @@ index e181df6f4..4a9132c70 100644
      /**
       * Mirror
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index d8358a0f0..d0b813008 100644
+index d8358a0f03..d0b813008c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 @@ -196,4 +196,22 @@ public class DummyGeneratorAccess implements GeneratorAccess {
@@ -3276,7 +3276,7 @@ index d8358a0f0..d0b813008 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
-index 1aec70a1f..f72c13bed 100644
+index 1aec70a1f1..f72c13beda 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
 @@ -17,7 +17,7 @@ import java.util.RandomAccess;

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

@@ -1,4 +1,4 @@
-From 7d359c397e600267fe7d4f10e7c35e6bc7523fd5 Mon Sep 17 00:00:00 2001
+From 0ee183d069ba046f8fe24a3f2d8f402a9c7f3a79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 01:40:13 -0400
 Subject: [PATCH] Add MinecraftKey Information to Objects
@@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects
 Stores the reference to the objects respective MinecraftKey
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index db899937b..eecf27370 100644
+index db899937be..eecf27370b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -178,7 +178,7 @@ public class PaperCommand extends Command {
@@ -19,7 +19,7 @@ index db899937b..eecf27370 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c07284d35..a8ea70b36 100644
+index 8789191fe6..7899fd6d88 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -31,7 +31,7 @@ index c07284d35..a8ea70b36 100644
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -1708,12 +1708,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1707,12 +1707,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
@@ -65,7 +65,7 @@ index c07284d35..a8ea70b36 100644
  
      protected abstract void a(NBTTagCompound nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index cbf0c2f25..79f854966 100644
+index cbf0c2f25d..79f8549660 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -237,6 +237,7 @@ public class EntityTypes<T extends Entity> {
@@ -78,7 +78,7 @@ index cbf0c2f25..79f854966 100644
      }
 diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
 new file mode 100644
-index 000000000..743142d03
+index 0000000000..743142d030
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/KeyedObject.java
 @@ -0,0 +1,9 @@
@@ -92,7 +92,7 @@ index 000000000..743142d03
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 40752f761..9071bb7ec 100644
+index 40752f7617..9071bb7ece 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,7 +11,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -141,5 +141,5 @@ index 40752f761..9071bb7ec 100644
      public World getWorld() {
          return this.world;
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,4 +1,4 @@
-From 5dceede9a1d0b751290ea95355ee03e831d4be85 Mon Sep 17 00:00:00 2001
+From dae2dd0f30fa7917420fe3ee0d590b1ce1efc551 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index af10c18d4..02b142fe8 100644
+index af10c18d44..02b142fe8b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -29,7 +29,7 @@ public class Chunk implements IChunkAccess {
@@ -89,7 +89,7 @@ index af10c18d4..02b142fe8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e9e40f159..306724e69 100644
+index 7899fd6d88..d2cfc65513 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -101,7 +101,7 @@ index e9e40f159..306724e69 100644
      public int chunkX; public int getChunkX() { return chunkX; } // Paper - OBFHELPER
      public int chunkY; public int getChunkY() { return chunkY; } // Paper - OBFHELPER
      public int chunkZ; public int getChunkZ() { return chunkZ; } // Paper - OBFHELPER
-@@ -1709,6 +1709,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1708,6 +1708,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
@@ -142,7 +142,7 @@ index e9e40f159..306724e69 100644
      private String entityKeyString;
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 9071bb7ec..820180ab3 100644
+index 9071bb7ece..820180ab3f 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -51,6 +51,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -162,7 +162,7 @@ index 9071bb7ec..820180ab3 100644
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 63ecbcd47..c82c21326 100644
+index 63ecbcd47a..c82c213260 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -138,6 +138,7 @@ import net.minecraft.server.EntityZombieVillager;

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

@@ -1,4 +1,4 @@
-From 3fd06184c267fa162162c17e6e763702234ed2eb Mon Sep 17 00:00:00 2001
+From f9787ca0388662098768e6d0f11a359990dbeec2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -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 000000000..69e26a826
+index 0000000000..69e26a8267
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,141 @@
@@ -153,7 +153,7 @@ index 000000000..69e26a826
 +}
 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 000000000..3a79cde59
+index 0000000000..3a79cde595
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,130 @@
@@ -288,7 +288,7 @@ index 000000000..3a79cde59
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b6d470e59..f402a29b0 100644
+index b6d470e594..f402a29b09 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -335,7 +335,7 @@ index b6d470e59..f402a29b0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index cd72a9c84..5de881371 100644
+index cd72a9c845..5de881371a 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -31,6 +31,15 @@ public class Block implements IMaterial {
@@ -355,7 +355,7 @@ index cd72a9c84..5de881371 100644
      private final float frictionFactor;
      private final float f;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e58dd3e6d..0b32179b7 100644
+index e58dd3e6df..0b32179b79 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -576,6 +576,7 @@ public class Chunk implements IChunkAccess {
@@ -375,7 +375,7 @@ index e58dd3e6d..0b32179b7 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index f558ae441..2107ddc48 100644
+index f558ae4417..2107ddc48f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -227,11 +227,13 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -487,7 +487,7 @@ index f558ae441..2107ddc48 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index e16d30f2c..4af5a230b 100644
+index e16d30f2ca..4af5a230ba 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -525,7 +525,7 @@ index e16d30f2c..4af5a230b 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index 8d7a6d240..707bd2600 100644
+index 8d7a6d2403..707bd2600d 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -13,12 +13,22 @@ public class CustomFunction {
@@ -552,7 +552,7 @@ index 8d7a6d240..707bd2600 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 ba40d5fbb..ee42e1dfa 100644
+index ba40d5fbb5..ee42e1dfa4 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -103,7 +103,7 @@ public class CustomFunctionData implements IResourcePackListener {
@@ -565,7 +565,7 @@ index ba40d5fbb..ee42e1dfa 100644
                  int k = 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 9eed98e37..d6646d7e6 100644
+index 9eed98e379..d6646d7e61 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -20,6 +20,8 @@ import java.util.List;
@@ -653,7 +653,7 @@ index 9eed98e37..d6646d7e6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 306724e69..5635192f7 100644
+index d2cfc65513..74a4bf9c5c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -675,7 +675,7 @@ index 306724e69..5635192f7 100644
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -505,7 +506,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -504,7 +505,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -683,7 +683,7 @@ index 306724e69..5635192f7 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().b(vec3d));
              this.recalcPosition();
-@@ -657,7 +657,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -656,7 +656,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.getMethodProfiler().exit();
          }
@@ -692,7 +692,7 @@ index 306724e69..5635192f7 100644
  
      protected BlockPosition ag() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1f350e335..35e3f1c78 100644
+index 1f350e3352..35e3f1c78d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -37,7 +37,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -768,7 +768,7 @@ index 1f350e335..35e3f1c78 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b4a0bd795..4dc691775 100644
+index b4a0bd7951..4dc6917759 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -63,7 +63,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -944,7 +944,7 @@ index b4a0bd795..4dc691775 100644
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 93d838ec2..2a6955f85 100644
+index 93d838ec2d..2a6955f855 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,7 +1,9 @@
@@ -1027,7 +1027,7 @@ index 93d838ec2..2a6955f85 100644
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6a681d694..914366afc 100644
+index 6a681d694e..914366afcd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1082,7 +1082,7 @@ index 6a681d694..914366afc 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 2c671629a..eb3269e0e 100644
+index 2c671629a4..eb3269e0ea 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -1109,7 +1109,7 @@ index 2c671629a..eb3269e0e 100644
                      PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
                  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0694f4563..1652a57e2 100644
+index 0694f4563e..1652a57e25 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1133,7 +1133,7 @@ index 0694f4563..1652a57e2 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 00bbd34b6..f533860bb 100644
+index 00bbd34b6a..f533860bbe 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -28,13 +28,18 @@ public class TickListServer<T> implements TickList<T> {
@@ -1183,7 +1183,7 @@ index 00bbd34b6..f533860bb 100644
              this.g.clear();
          }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 820180ab3..fa6400dcc 100644
+index 820180ab3f..fa6400dccd 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -9,11 +9,12 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
@@ -1202,7 +1202,7 @@ index 820180ab3..fa6400dcc 100644
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 304dfac06..da3eb20d4 100644
+index 304dfac061..da3eb20d45 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -1258,7 +1258,7 @@ index 304dfac06..da3eb20d4 100644
              CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8a5ac6f69..069898bad 100644
+index 8a5ac6f69b..069898bad7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,6 +1,8 @@
@@ -1383,7 +1383,7 @@ index 8a5ac6f69..069898bad 100644
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0c9d5d231..49be263ae 100644
+index 0c9d5d2314..49be263aea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1951,12 +1951,31 @@ public final class CraftServer implements Server {
@@ -1420,7 +1420,7 @@ index 0c9d5d231..49be263ae 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 2bd22a369..000000000
+index 2bd22a3698..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,162 +0,0 @@
@@ -1587,7 +1587,7 @@ index 2bd22a369..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9eba8449e..1094190fd 100644
+index 9eba8449e4..1094190fd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1753,6 +1753,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1606,7 +1606,7 @@ index 9eba8449e..1094190fd 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 b90979c7b..8823f94f7 100644
+index b90979c7ba..8823f94f7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -1,5 +1,6 @@
@@ -1672,7 +1672,7 @@ index b90979c7b..8823f94f7 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 3f55381c1..0d9a46680 100644
+index 3f55381c15..0d9a466809 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,9 +1,11 @@
@@ -1757,7 +1757,7 @@ index 3f55381c1..0d9a46680 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 e52ef47b7..3d90b3426 100644
+index e52ef47b78..3d90b34268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1769,7 +1769,7 @@ index e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 68728b4d8..02f330053 100644
+index 68728b4d86..02f3300533 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -298,6 +298,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -1787,7 +1787,7 @@ index 68728b4d8..02f330053 100644
       * This helper class represents the different NBT Tags.
       * <p>
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index ca7789b5e..442383969 100644
+index ca7789b5e0..4423839697 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -31,7 +31,7 @@ import net.minecraft.server.EntityWither;

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

@@ -1,11 +1,11 @@
-From d1cf5f168a9ffaf22b7d5e070e2800f33794a995 Mon Sep 17 00:00:00 2001
+From e34c8a30bba3a35462e19d7de161c7fef123484f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump and take water damage
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7d9976ce6..6d6a68cb1 100644
+index 7d9976ce6b..6d6a68cb1b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -92,4 +92,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 7d9976ce6..6d6a68cb1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
-index 2e869004c..8a6856e0f 100644
+index 2e869004c8..8a6856e0fd 100644
 --- a/src/main/java/net/minecraft/server/ControllerJump.java
 +++ b/src/main/java/net/minecraft/server/ControllerJump.java
 @@ -13,6 +13,7 @@ public class ControllerJump {
@@ -31,10 +31,10 @@ index 2e869004c..8a6856e0f 100644
          this.b.setJumping(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5635192f7..8a58afd1c 100644
+index 74a4bf9c5c..b109f5ae2c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1104,6 +1104,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1103,6 +1103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain();
      }
  
@@ -43,7 +43,7 @@ index 5635192f7..8a58afd1c 100644
          return this.isInWater() || this.isInRain() || this.l();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 1cc66108d..538c2169c 100644
+index 1cc66108d0..538c2169cd 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -171,7 +171,7 @@ public class EntityEnderman extends EntityMonster {
@@ -56,7 +56,7 @@ index 1cc66108d..538c2169c 100644
  
          if (this.world.isDay() && this.ticksLived >= this.bA + 600) {
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7ee5eb987..68ce38d66 100644
+index 0b06fa2b66..70cd0801dc 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -32,6 +32,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -67,11 +67,12 @@ index 7ee5eb987..68ce38d66 100644
      public PathfinderGoalSelector targetSelector;
      private EntityLiving goalTarget;
      private final EntitySenses bw;
-@@ -643,6 +644,15 @@ public abstract class EntityInsentient extends EntityLiving {
-         // Spigot Start
-         if ( this.fromMobSpawner )
-         {
-+            // Paper start - Allow nerfed mobs to jump, float and take water damage
+@@ -648,7 +649,17 @@ public abstract class EntityInsentient extends EntityLiving {
+     @Override
+     protected final void doTick() {
+         ++this.ticksFarFromPlayer;
+-        if (!this.aware) return; // CraftBukkit
++        if (!this.aware) { // Paper start - Allow nerfed mobs to jump, float and take water damage
 +            if (goalFloat != null) {
 +                if (goalFloat.validConditions()) goalFloat.update();
 +                this.getControllerJump().jumpIfSet();
@@ -79,12 +80,14 @@ index 7ee5eb987..68ce38d66 100644
 +            if ((this instanceof EntityBlaze || this instanceof EntityEnderman) && isInWaterOrRainOrBubble()) {
 +                damageEntity(DamageSource.DROWN, 1.0F);
 +            }
++            return;
++        }
 +        // Paper end
-             return;
-         }
-         // Spigot End
+         this.world.getMethodProfiler().enter("sensing");
+         this.bw.a();
+         this.world.getMethodProfiler().exit();
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index 0f0dc7277..43908b040 100644
+index 0f0dc7277f..43908b0400 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -8,10 +8,12 @@ public class PathfinderGoalFloat extends PathfinderGoal {

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

@@ -1,11 +1,11 @@
-From 304877d731851ff356c497d69c2ab8f5943a3c7c Mon Sep 17 00:00:00 2001
+From 150dd44b4bb4169b9568dfc931b7a77f40469e65 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 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 6d6a68cb1..284568641 100644
+index 6d6a68cb1b..2845686411 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -97,4 +97,20 @@ public class PaperWorldConfig {
@@ -30,10 +30,10 @@ index 6d6a68cb1..284568641 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e3603685b..e1c254dd5 100644
+index 70cd0801dc..23995b68a1 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -622,11 +622,11 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -630,11 +630,11 @@ public abstract class EntityInsentient extends EntityLiving {
              if (entityhuman != null) {
                  double d0 = entityhuman.h(this);
  
@@ -48,5 +48,5 @@ index e3603685b..e1c254dd5 100644
                  } else if (d0 < 1024.0D) {
                      this.ticksFarFromPlayer = 0;
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,11 +1,11 @@
-From 864641455a023964771286a85f3e8e3015c7b96a Mon Sep 17 00:00:00 2001
+From 29bf2090d4841235a60c315f94a35c3fe2172998 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8ee2b9bb1..d59b82b7b 100644
+index 8ee2b9bb1b..d59b82b7bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -119,4 +119,14 @@ public class PaperWorldConfig {
@@ -24,10 +24,10 @@ index 8ee2b9bb1..d59b82b7b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 61b72b55f..7a8bcf904 100644
+index b109f5ae2c..b8792bb6f1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1815,6 +1815,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1814,6 +1814,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
@@ -36,7 +36,7 @@ index 61b72b55f..7a8bcf904 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 4b4e71bf7..cb21ce0b1 100644
+index 4b4e71bf70..cb21ce0b1a 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -85,6 +85,16 @@ public class EntityFallingBlock extends Entity {
@@ -57,7 +57,7 @@ index 4b4e71bf7..cb21ce0b1 100644
                  blockposition = new BlockPosition(this);
                  boolean flag = this.block.getBlock() instanceof BlockConcretePowder;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index d04212436..33c51dced 100644
+index d042124362..33c51dced7 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -54,6 +54,11 @@ public class EntityTNTPrimed extends Entity {
@@ -73,7 +73,7 @@ index d04212436..33c51dced 100644
          if (this.onGround) {
              this.setMot(this.getMot().d(0.7D, -0.5D, 0.7D));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1094190fd..35dbed40d 100644
+index 1094190fd9..35dbed40df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -836,7 +836,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From 54a20d91ce0ef3e854dfc89bea1b34ee94554197 Mon Sep 17 00:00:00 2001
+From a34a1fa15b9f78bb2654fd38a1b22b434468e1a6 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 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 1adeeb9c4..747f5eeb6 100644
+index 242129ae42..26adb55409 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -71,6 +71,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,10 +19,10 @@ index 1adeeb9c4..747f5eeb6 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 e1c254dd5..f389e5565 100644
+index 23995b68a1..1732c1ae95 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -619,7 +619,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -627,7 +627,7 @@ public abstract class EntityInsentient extends EntityLiving {
          } else if (!this.isPersistent() && !this.I()) {
              EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
  
@@ -32,7 +32,7 @@ index e1c254dd5..f389e5565 100644
  
                  if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 102b3a3c4..08c2a22f7 100644
+index 102b3a3c48..08c2a22f7a 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -99,7 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -45,7 +45,7 @@ index 102b3a3c4..08c2a22f7 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 35dbed40d..f7a4fdb83 100644
+index 35dbed40df..f7a4fdb833 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1661,7 +1661,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -69,5 +69,5 @@ index 35dbed40d..f7a4fdb83 100644
      @Override
      public void updateCommands() {
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,11 +1,11 @@
-From a0fa40f27cf5327758e0940ccb947e55bf9c819e Mon Sep 17 00:00:00 2001
+From 85a4e1989ff00a6ab9e60fa579668fd022f752f1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7a8bcf904..6947a9089 100644
+index b8792bb6f1..1b2edca722 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -167,6 +167,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index 7a8bcf904..6947a9089 100644
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1581,6 +1582,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1580,6 +1581,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  this.bukkitEntity.storeBukkitValues(nbttagcompound);
              }
              // CraftBukkit end
@@ -28,7 +28,7 @@ index 7a8bcf904..6947a9089 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1695,6 +1701,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1694,6 +1700,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.getBukkitEntity().readBukkitValues(nbttagcompound);
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index 7a8bcf904..6947a9089 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1772,6 +1785,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1771,6 +1784,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -51,7 +51,7 @@ index 7a8bcf904..6947a9089 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index cb21ce0b1..40fd012ae 100644
+index cb21ce0b1a..40fd012ae2 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -253,6 +253,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index cb21ce0b1..40fd012ae 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 33c51dced..346315acb 100644
+index 33c51dced7..346315acb7 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -103,6 +103,14 @@ public class EntityTNTPrimed extends Entity {
@@ -89,7 +89,7 @@ index 33c51dced..346315acb 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index 5406f4c40..d778eac45 100644
+index 5406f4c40f..d778eac45d 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -188,6 +188,7 @@ public class NBTTagList extends NBTList<NBTBase> {
@@ -101,7 +101,7 @@ index 5406f4c40..d778eac45 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 069898bad..ce9bad42f 100644
+index 069898bad7..ce9bad42f8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1176,6 +1176,11 @@ public class WorldServer extends World {
@@ -117,7 +117,7 @@ index 069898bad..ce9bad42f 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c82c21326..a29693674 100644
+index c82c213260..a296936748 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1007,4 +1007,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

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

@@ -1,11 +1,11 @@
-From 66cc209a149c04e13e7100ffa03174f3256ef3f0 Mon Sep 17 00:00:00 2001
+From 8bf306906c2242f0e0e2409fb29411a2a1cb4c4f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 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 d59b82b7b..f7a0a33e4 100644
+index d59b82b7bb..f7a0a33e49 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -129,4 +129,19 @@ public class PaperWorldConfig {
@@ -29,10 +29,10 @@ index d59b82b7b..f7a0a33e4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ecf9f9f76..1ce080287 100644
+index 1b2edca722..251087ec20 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -407,9 +407,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -406,9 +406,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.fallDistance *= 0.5F;
          }
  
@@ -49,7 +49,7 @@ index ecf9f9f76..1ce080287 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -419,6 +426,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -418,6 +425,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.world.getMethodProfiler().exit();
      }
  
@@ -67,7 +67,7 @@ index ecf9f9f76..1ce080287 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -494,6 +512,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -493,6 +511,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
@@ -76,7 +76,7 @@ index ecf9f9f76..1ce080287 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index e7fc442c8..1b64ad824 100644
+index e4d1f37f9f..c2843d5d60 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -210,9 +210,15 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -96,5 +96,5 @@ index e7fc442c8..1b64ad824 100644
          // this.doPortalTick(); // CraftBukkit - handled in postTick
          if (this.world.isClientSide) {
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,11 +1,11 @@
-From ee7129e7fec26e0f9606a4f15e94991153e796b3 Mon Sep 17 00:00:00 2001
+From 686cdb916272e2534b102708935d7e1e4133b89d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 62e793b71..cd47a4ca0 100644
+index 62e793b71b..cd47a4ca06 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -191,4 +191,11 @@ public class PaperWorldConfig {
@@ -21,10 +21,10 @@ index 62e793b71..cd47a4ca0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 57caf9ca9..8e9dff96e 100644
+index 251087ec20..514315604e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2575,7 +2575,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2574,7 +2574,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
                  blockposition = new BlockPosition(d0, this.locY(), d1);
                  // CraftBukkit start
@@ -34,7 +34,7 @@ index 57caf9ca9..8e9dff96e 100644
                      return null;
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f0f456983..b5101af01 100644
+index f0f456983f..b5101af011 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -755,7 +755,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -49,7 +49,7 @@ index f0f456983..b5101af01 100644
              if (event.isCancelled() || event.getTo() == null) {
                  return null;
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 19c54f1dd..f84dd6d9b 100644
+index 19c54f1dde..f84dd6d9be 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -45,7 +45,7 @@ public class PortalTravelAgent {

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

@@ -1,4 +1,4 @@
-From f1ade2deae8856ff8e70d0cf2de50184a98f6be6 Mon Sep 17 00:00:00 2001
+From 6d41fcca29dcbe9747892fe9fe63f149cf38a238 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index abbf59bb9..04430aae5 100644
+index abbf59bb91..04430aae52 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -203,4 +203,9 @@ public class PaperWorldConfig {
@@ -25,10 +25,10 @@ index abbf59bb9..04430aae5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8e9dff96e..8764af44e 100644
+index 514315604e..d95d9c7203 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2266,6 +2266,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2265,6 +2265,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {
@@ -37,7 +37,7 @@ index 8e9dff96e..8764af44e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9bd673700..cd9c49747 100644
+index 9bd6737007..cd9c49747d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -535,6 +535,7 @@ public abstract class EntityLiving extends Entity {

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

@@ -1,4 +1,4 @@
-From e6571749240e4580c986c049559599aa55a27cb3 Mon Sep 17 00:00:00 2001
+From 21c88e53a02069dab8e9e1606d4c6d62eeac08ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a38dd15f0..6fe4e85d9 100644
+index d95d9c7203..4f81321b94 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index a38dd15f0..6fe4e85d9 100644
      private CraftEntity bukkitEntity;
  
      public CraftEntity getBukkitEntity() {
-@@ -193,7 +208,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -192,7 +207,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.y = Vec3D.a;
          this.av = 1.0F;
          this.aw = 1.0F;
@@ -41,5 +41,5 @@ index a38dd15f0..6fe4e85d9 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,11 +1,11 @@
-From 675e57aaf80ab577179f5b63a809cba9daeb4afc Mon Sep 17 00:00:00 2001
+From 857bcd25e8fefef7ed6d333e6150bdaa47c6b2e9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6db131203..8cf3076f4 100644
+index 6db1312035..8cf3076f4e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,10 +32,10 @@ index 6db131203..8cf3076f4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2b2a3170d..8a9cf0d08 100644
+index fffb3c0bba..5bbd2c98a5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2714,6 +2714,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2713,6 +2713,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bM() {
@@ -49,7 +49,7 @@ index 2b2a3170d..8a9cf0d08 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 346315acb..d3b2075f2 100644
+index 346315acb7..d3b2075f25 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -79,7 +79,27 @@ public class EntityTNTPrimed extends Entity {
@@ -94,7 +94,7 @@ index 346315acb..d3b2075f2 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index a13fd9b34..3ff7a7b4a 100644
+index a13fd9b340..3ff7a7b4a8 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -36,7 +36,7 @@ public class EntityTrackerEntry {

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

@@ -1,14 +1,14 @@
-From 2f10a598939d22fd447b064284720a611923f9b2 Mon Sep 17 00:00:00 2001
+From 47db2f72df0c321d5a3fba2afb32d74739421a1e Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 57bf3a146..2038e7fb9 100644
+index cfa7bc59f2..59cf0d1017 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2026,6 +2026,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2025,6 +2025,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit

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

@@ -1,4 +1,4 @@
-From 37f614ddeea80462ea7e2c996f5fa19922ea4d4f Mon Sep 17 00:00:00 2001
+From 48a505cdbeda1a8b88ffd38e6e9a1dfd87dc078b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -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 f164844f3..751551f17 100644
+index f164844f33..751551f173 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -322,4 +322,10 @@ public class PaperWorldConfig {
@@ -27,19 +27,19 @@ index f164844f3..751551f17 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1b8a49383..20a8041ba 100644
+index 59cf0d1017..0b08e9b31b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+     public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
-     public boolean fromMobSpawner;
 +    protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2775afc32..74de19bbf 100644
+index 2775afc327..74de19bbfb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2623,8 +2623,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index 2775afc32..74de19bbf 100644
                  this.C(entity);
              }
 -- 
-2.25.0.windows.1
+2.25.0
 

Spigot-Server-Patches/0152-Item-canEntityPickup.patch

@@ -1,14 +1,14 @@
-From f1a23b56cf060e8ca98f48426d7d1bd9f5cc5dae Mon Sep 17 00:00:00 2001
+From dc28ce75c8988094bb77818413f2eadce20f0c96 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f389e5565..5ca281172 100644
+index 1732c1ae95..b5816dc89e 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -513,6 +513,11 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -521,6 +521,11 @@ public abstract class EntityInsentient extends EntityLiving {
                  EntityItem entityitem = (EntityItem) iterator.next();
  
                  if (!entityitem.dead && !entityitem.getItemStack().isEmpty() && !entityitem.p()) {
@@ -21,7 +21,7 @@ index f389e5565..5ca281172 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index f657607a1..9973fc0b1 100644
+index 208dad2a34..97c6a8b6bd 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -20,6 +20,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index f657607a1..9973fc0b1 100644
      public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc9..3f552b590 100644
+index cc593fbc99..3f552b5905 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -54,5 +54,5 @@ index cc593fbc9..3f552b590 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,22 +1,22 @@
-From f2b6e66cd8031c5df969a0082b5f92ef90715853 Mon Sep 17 00:00:00 2001
+From e9ee7cc846760bee9c3e2e4f8d02c315abd1acff Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9b47da4e8..393f5b2d2 100644
+index 0b08e9b31b..64dc37c70c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+     public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
-     public boolean fromMobSpawner;
 +    public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1622,6 +1623,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1621,6 +1622,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index 9b47da4e8..393f5b2d2 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1742,6 +1747,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1741,6 +1746,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (!originTag.isEmpty()) {
                  origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
              }
@@ -37,19 +37,19 @@ index 9b47da4e8..393f5b2d2 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index deb32db2b..8384a2cbf 100644
+index b249af20c4..ab5d83d34d 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-@@ -134,6 +134,7 @@ public abstract class MobSpawnerAbstract {
-                                 ((EntityInsentient) entity).prepare(world, world.getDamageScaler(new BlockPosition(entity)), EnumMobSpawn.SPAWNER, (GroupDataEntity) null, (NBTTagCompound) null);
+@@ -140,6 +140,7 @@ public abstract class MobSpawnerAbstract {
                              }
+                             // Spigot End
                          }
 +                        entity.spawnedViaMobSpawner = true; // Paper
                          // Spigot Start
-                         if ( entity.world.spigotConfig.nerfSpawnerMobs )
-                         {
+                         if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
+                             Entity vehicle = entity.getVehicle();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bb07dec3c..495a7c464 100644
+index bb07dec3c8..495a7c464f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1045,5 +1045,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch

@@ -1,24 +1,22 @@
-From fe9d2d7e016e997976674ae65da333ca710c2809 Mon Sep 17 00:00:00 2001
+From 59016efe7eff58950e55e8102fc6ee2af6b41461 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 8384a2cbf..258e96ba5 100644
+index ab5d83d34d..c38295a09d 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-@@ -140,6 +140,9 @@ public abstract class MobSpawnerAbstract {
-                         {
-                             entity.fromMobSpawner = true;
+@@ -142,6 +142,7 @@ public abstract class MobSpawnerAbstract {
                          }
-+
+                         entity.spawnedViaMobSpawner = true; // Paper
+                         // Spigot Start
 +                        flag = true; // Paper
-+
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
                              Entity vehicle = entity.getVehicle();
                              if (vehicle != null) {
-@@ -157,7 +160,7 @@ public abstract class MobSpawnerAbstract {
+@@ -160,7 +161,7 @@ public abstract class MobSpawnerAbstract {
                              ((EntityInsentient) entity).doSpawnEffect();
                          }
  
@@ -28,5 +26,5 @@ index 8384a2cbf..258e96ba5 100644
                  }
  
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,4 +1,4 @@
-From 16f966bda6ab00168e8262eea1cce8dd381f7bb5 Mon Sep 17 00:00:00 2001
+From 4f8d778101a5b5dc9ffe73b19f14d72796e5efdb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 393f5b2d2..7752752d4 100644
+index 64dc37c70c..ec59ffc2e7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2500,7 +2500,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2499,7 +2499,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {

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

@@ -1,4 +1,4 @@
-From e8d0b2c90a6e8abd3404c38ca5b18e28e531c73e Mon Sep 17 00:00:00 2001
+From 1f36f26c18a57565356f9a8514cc467d7b0094d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index eecf27370..d704fc79c 100644
+index eecf27370b..d704fc79c0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -179,6 +179,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index eecf27370..d704fc79c 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1d47e4737..c464d6962 100644
+index 1d47e47370..c464d69623 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -681,6 +681,7 @@ public class Chunk implements IChunkAccess {
@@ -51,10 +51,10 @@ index 1d47e4737..c464d6962 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 09ec144eb..4880ece94 100644
+index ace74179ce..5d9d32ea45 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -196,6 +196,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
@@ -63,7 +63,7 @@ index 09ec144eb..4880ece94 100644
      public float getBukkitYaw() {
          return this.yaw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 70e4b58a9..54505e056 100644
+index 70e4b58a93..54505e056e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -904,7 +904,7 @@ public class WorldServer extends World {
@@ -92,7 +92,7 @@ index 70e4b58a9..54505e056 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f957d4272..a6a273c31 100644
+index f957d42723..a6a273c31b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1021,6 +1021,7 @@ public class CraftWorld implements World {

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

@@ -1,4 +1,4 @@
-From 41c4a4554a1995344762b3f76596b1ef69aba947 Mon Sep 17 00:00:00 2001
+From 62639edfe6a049398609911a06275206555c92ef Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 6daa400d2..38fe29f8a 100644
+index 6daa400d27..38fe29f8a2 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,10 +27,10 @@ index 6daa400d2..38fe29f8a 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fbb5872d0..b7c19f255 100644
+index 02aa493f17..e8b70a5ca5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1504,6 +1504,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -38,7 +38,7 @@ index fbb5872d0..b7c19f255 100644
      public void a(Entity entity, int i, DamageSource damagesource) {
          if (entity instanceof EntityPlayer) {
              CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
-@@ -2414,6 +2415,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2413,6 +2414,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fallDistance = 0.0F;
      }
  
@@ -47,7 +47,7 @@ index fbb5872d0..b7c19f255 100644
  
      protected void k(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 42b9a339e..8ad131e4f 100644
+index 42b9a339e9..8ad131e4fc 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -701,7 +701,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 42b9a339e..8ad131e4f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 2be6c7bde..82a32d5db 100644
+index 2be6c7bde9..82a32d5dbf 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 2be6c7bde..82a32d5db 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
-index 80717ad9a..53aac5bcc 100644
+index 80717ad9ac..53aac5bccd 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 @@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
@@ -119,7 +119,7 @@ index 80717ad9a..53aac5bcc 100644
      public void b(NBTTagCompound nbttagcompound) {
          super.b(nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fa097e055..eed3e7c58 100644
+index fa097e0551..eed3e7c58e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity {
@@ -279,7 +279,7 @@ index fa097e055..eed3e7c58 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 a9a16eace..52bbe4fc0 100644
+index a9a16eace9..52bbe4fc02 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -330,7 +330,7 @@ index a9a16eace..52bbe4fc0 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 90fdf89c8..b761a41dc 100644
+index 90fdf89c81..b761a41dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -821,6 +821,22 @@ public enum CraftSound {
@@ -357,7 +357,7 @@ index 90fdf89c8..b761a41dc 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 352ef3669..a2bda708c 100644
+index 352ef3669d..a2bda708cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1730,7 +1730,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -378,7 +378,7 @@ index 352ef3669..a2bda708c 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 f006b441a..39ce40bd5 100644
+index f006b441ad..39ce40bd58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -749,9 +749,16 @@ public class CraftEventFactory {

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

@@ -1,4 +1,4 @@
-From 8f4f80d58d277d5e4faef9ed9ee355a2791c5f1a Mon Sep 17 00:00:00 2001
+From 4be55289f11432ae8f1525e88839e5c5732836db Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index 786712297..ef2a496ed 100644
+index 7867122974..ef2a496eda 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -59,7 +59,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,10 +26,10 @@ index 786712297..ef2a496ed 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 b7c19f255..d31cbdcec 100644
+index e8b70a5ca5..9a23380600 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1680,7 +1680,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.Z();
                      this.setYawPitch(this.yaw, this.pitch);
                      if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
@@ -39,7 +39,7 @@ index b7c19f255..d31cbdcec 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 2a22bc6f3..3a482466e 100644
+index 2a22bc6f3e..3a482466ec 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -409,4 +409,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 2a22bc6f3..3a482466e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 93911a825..d35604edb 100644
+index 93911a8251..d35604edb2 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -60,7 +60,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 93911a825..d35604edb 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 473ec2cbd..ab6b86e4e 100644
+index 473ec2cbde..ab6b86e4e9 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento

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

@@ -1,14 +1,14 @@
-From 85160421b209c8bef16909fd1cbc881c16b0e24a Mon Sep 17 00:00:00 2001
+From acbf444d827b68afd4c0b3a95289fa3abc00523b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 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 8a5fa0762..528b2b78c 100644
+index b5816dc89e..bed15873b6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1337,6 +1337,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1341,6 +1341,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return flag;
      }
  
@@ -17,7 +17,7 @@ index 8a5fa0762..528b2b78c 100644
          if (this.world.isDay() && !this.world.isClientSide) {
              float f = this.aI();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ce1ac730c..323d78b22 100644
+index ce1ac730cb..323d78b22f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -852,6 +852,13 @@ public class CraftWorld implements World {
@@ -35,10 +35,10 @@ index ce1ac730c..323d78b22 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154e..56c233872 100644
+index c89bc7024b..eaad222fd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-@@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
+@@ -78,4 +78,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
      public long getSeed() {
          return getHandle().lootTableSeed;
      }

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

@@ -1,14 +1,14 @@
-From 7fea1461bdfe5da3ad4dcf9548cb63ed41200b0e Mon Sep 17 00:00:00 2001
+From 7bf6c013db4ac1e64b1feeb284d896efc66c82f2 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d31cbdcec..7ce0ed251 100644
+index 9a23380600..ecd0387627 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2327,6 +2327,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -17,7 +17,7 @@ index d31cbdcec..7ce0ed251 100644
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 10ca229cb..f33580f8c 100644
+index 10ca229cb4..f33580f8c5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1865,6 +1865,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,4 +1,4 @@
-From af29b30adfb228cf9c8d849cbb086acd5101b7b8 Mon Sep 17 00:00:00 2001
+From 9856623497011fc34aab0913f4776faa0a7efbd5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,10 +20,10 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 166c1295d..ec4cac942 100644
+index ecd0387627..f900c1a2a3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2028,12 +2028,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2027,12 +2027,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -41,7 +41,7 @@ index 166c1295d..ec4cac942 100644
          }
  
      }
-@@ -2084,7 +2087,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2083,7 +2086,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return true; // CraftBukkit
      }
  
@@ -53,7 +53,7 @@ index 166c1295d..ec4cac942 100644
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2094,7 +2100,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2093,7 +2099,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) getBukkitEntity(),
@@ -62,7 +62,7 @@ index 166c1295d..ec4cac942 100644
                  );
                  Bukkit.getPluginManager().callEvent(event);
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
-@@ -2105,7 +2111,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2104,7 +2110,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
              // Spigot start
@@ -72,7 +72,7 @@ index 166c1295d..ec4cac942 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 308ac18f7..584166f22 100644
+index 308ac18f7e..584166f225 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index 308ac18f7..584166f22 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index eed3e7c58..4e64a80a8 100644
+index eed3e7c58e..4e64a80a8a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2735,11 +2735,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index eed3e7c58..4e64a80a8 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 f33580f8c..68e12cf98 100644
+index f33580f8c5..68e12cf987 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1019,11 +1019,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,14 +1,14 @@
-From cee59d11ce246afef56fc7024f45d0b7823a1450 Mon Sep 17 00:00:00 2001
+From 78651298e03c7548fcbc65d604158f5740d3762c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 528b2b78c..cc10db88b 100644
+index bed15873b6..6d53254f83 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1256,6 +1256,8 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1260,6 +1260,8 @@ public abstract class EntityInsentient extends EntityLiving {
          this.datawatcher.set(EntityInsentient.b, flag ? (byte) (b0 | 2) : (byte) (b0 & -3));
      }
  
@@ -18,7 +18,7 @@ index 528b2b78c..cc10db88b 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 31aba6bfc..2d4f8aac8 100644
+index 31aba6bfc3..2d4f8aac8f 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index 31aba6bfc..2d4f8aac8 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020..c4320dbb6 100644
+index 0429cf020e..c4320dbb67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {

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

@@ -1,11 +1,11 @@
-From 27017af9067b30b625870a4026a4d1a74380de86 Mon Sep 17 00:00:00 2001
+From 70650bfa857e2488f4ac5c4aa24de157585a87ba Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 4f60b931a..c950139c0 100644
+index 4f60b931a1..c950139c0f 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -108,6 +108,7 @@ public class AxisAlignedBB {
@@ -46,10 +46,10 @@ index 4f60b931a..c950139c0 100644
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ec4cac942..7d27c08b9 100644
+index f900c1a2a3..5b7cdd66e3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1476,6 +1476,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1475,6 +1475,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.c(f - 90.0F, f1);
      }
  
@@ -57,7 +57,7 @@ index ec4cac942..7d27c08b9 100644
      public final Vec3D j(float f) {
          if (f == 1.0F) {
              return new Vec3D(this.locX(), this.getHeadY(), this.locZ());
-@@ -2127,6 +2128,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2126,6 +2127,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.getPassengers().size() < 1;
      }
  
@@ -66,7 +66,7 @@ index ec4cac942..7d27c08b9 100644
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4e64a80a8..af79b6e37 100644
+index 4e64a80a8a..af79b6e378 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3307,6 +3307,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index 4e64a80a8..af79b6e37 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index c1f462d9d..498f38109 100644
+index c1f462d9d3..498f381099 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -18,6 +18,7 @@ public final class IEntitySelector {
@@ -120,7 +120,7 @@ index c1f462d9d..498f38109 100644
          return !entity.isSpectator();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 6f4c6c589..b27fd44dc 100644
+index 6f4c6c5891..b27fd44dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -215,6 +215,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch

@@ -1,4 +1,4 @@
-From 96be0f0fb1cf946e1484e2f54d246668c81e5669 Mon Sep 17 00:00:00 2001
+From 53e5cf11382fb34e7530ea39d15a23ed8c38bdb1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7d27c08b9..dd17967c6 100644
+index 5b7cdd66e3..b45afbcde2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -21,7 +21,7 @@ index 7d27c08b9..dd17967c6 100644
      // Paper end
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-@@ -1629,6 +1630,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1628,6 +1629,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -31,7 +31,7 @@ index 7d27c08b9..dd17967c6 100644
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
-@@ -1755,6 +1759,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1754,6 +1758,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
@@ -59,7 +59,7 @@ index 7d27c08b9..dd17967c6 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d715d891..49437f212 100644
+index 9d715d891d..49437f2124 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -251,7 +251,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index 9d715d891..49437f212 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 49b1939d1..8074050b4 100644
+index 49b1939d17..8074050b43 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -997,6 +997,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index 49b1939d1..8074050b4 100644
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 915ccb180..dfa15372b 100644
+index 915ccb1807..dfa15372b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1051,5 +1051,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch

@@ -1,11 +1,11 @@
-From 2a39fb40df287b3eca48409df6ae4a9810743066 Mon Sep 17 00:00:00 2001
+From a2dc68532bf7368857fd232c64933c6c06b9692a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 90ca1ee14..b179893a1 100644
+index cb7cb789b8..41001b02a6 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract {
@@ -16,7 +16,7 @@ index 90ca1ee14..b179893a1 100644
      private boolean h() {
          BlockPosition blockposition = this.b();
  
-@@ -206,6 +207,7 @@ public abstract class MobSpawnerAbstract {
+@@ -207,6 +208,7 @@ public abstract class MobSpawnerAbstract {
          }
      }
  
@@ -24,7 +24,7 @@ index 90ca1ee14..b179893a1 100644
      private void i() {
          if (this.maxSpawnDelay <= this.minSpawnDelay) {
              this.spawnDelay = this.minSpawnDelay;
-@@ -223,7 +225,13 @@ public abstract class MobSpawnerAbstract {
+@@ -224,7 +226,13 @@ public abstract class MobSpawnerAbstract {
      }
  
      public void a(NBTTagCompound nbttagcompound) {
@@ -38,7 +38,7 @@ index 90ca1ee14..b179893a1 100644
          this.mobs.clear();
          if (nbttagcompound.hasKeyOfType("SpawnPotentials", 9)) {
              NBTTagList nbttaglist = nbttagcompound.getList("SpawnPotentials", 10);
-@@ -238,10 +246,15 @@ public abstract class MobSpawnerAbstract {
+@@ -239,10 +247,15 @@ public abstract class MobSpawnerAbstract {
          } else if (!this.mobs.isEmpty()) {
              this.setSpawnData((MobSpawnerData) WeightedRandom.a(this.a().random, this.mobs));
          }
@@ -57,7 +57,7 @@ index 90ca1ee14..b179893a1 100644
              this.spawnCount = nbttagcompound.getShort("SpawnCount");
          }
  
-@@ -266,9 +279,20 @@ public abstract class MobSpawnerAbstract {
+@@ -267,9 +280,20 @@ public abstract class MobSpawnerAbstract {
          if (minecraftkey == null) {
              return nbttagcompound;
          } else {
@@ -82,7 +82,7 @@ index 90ca1ee14..b179893a1 100644
              nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
              nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 5c4c3c70c..e78e3804b 100644
+index 5c4c3c70c7..e78e3804ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa

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

@@ -1,4 +1,4 @@
-From e2c2ff3e5872c41d91ea8e7e983e6395dec394bf Mon Sep 17 00:00:00 2001
+From c4206682d8b4a07c89cd83ec4b915d06196c3dce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -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 4ba72275b..572679e4d 100644
+index 4ba72275b9..572679e4d1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -442,4 +442,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index 4ba72275b..572679e4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c464d6962..3882e5b2a 100644
+index c464d69623..3882e5b2a6 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -396,6 +396,7 @@ public class Chunk implements IChunkAccess {
@@ -93,10 +93,10 @@ index c464d6962..3882e5b2a 100644
  
          int k = MathHelper.floor(entity.locY() / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dd17967c6..2b452be4b 100644
+index b45afbcde2..4021bb5b88 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2744,6 +2744,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2743,6 +2743,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
@@ -105,7 +105,7 @@ index dd17967c6..2b452be4b 100644
          this.uniqueID = uuid;
          this.am = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index fea28eec7..40f0b2dea 100644
+index fea28eec72..40f0b2deaa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,6 +1,7 @@
@@ -210,7 +210,7 @@ index fea28eec7..40f0b2dea 100644
  
                      if (list != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index fd0edea78..c969e9090 100644
+index fd0edea78a..c969e90901 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;

Spigot-Server-Patches/0394-Use-getChunkIfLoadedImmediately-in-places.patch

@@ -1,4 +1,4 @@
-From 3380218b97568ba835506047722e9907b3b8db69 Mon Sep 17 00:00:00 2001
+From a2a9787bedd50b5dfa6ddf5df4e8cd3a3e97eddf Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 8 Jul 2019 00:13:36 -0700
 Subject: [PATCH] Use getChunkIfLoadedImmediately in places
@@ -8,10 +8,10 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2b452be4b..6b5e92de0 100644
+index 4021bb5b88..2c8603e2fc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -204,7 +204,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -203,7 +203,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isChunkLoaded() {
@@ -21,7 +21,7 @@ index 2b452be4b..6b5e92de0 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 691331217..f88bcb29d 100644
+index 691331217b..f88bcb29db 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -34,7 +34,7 @@ index 691331217..f88bcb29d 100644
                                  return;
                              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9d604a758..bfbbfb1ba 100644
+index 9d604a758e..bfbbfb1bac 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -114,8 +114,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -73,7 +73,7 @@ index 9d604a758..bfbbfb1ba 100644
              return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).a((IBlockAccess) this, blockposition, entity);
          }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f86404f83..92601c581 100644
+index f86404f83a..92601c581c 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -143,9 +143,10 @@ public class ActivationRange

Spigot-Server-Patches/0401-only-add-passanger-entities-once-from-spawners.patch

@@ -1,14 +1,14 @@
-From d9e9829a94fd251395c72ef690300c4eb12aea2b Mon Sep 17 00:00:00 2001
+From 83d95ae5e0411d44c2995528f937b0cff3eecee2 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Wed, 21 Aug 2019 23:57:32 +0500
 Subject: [PATCH] only add passanger entities once from spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index b179893a1..b96f6461d 100644
+index 41001b02a6..df494d37be 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-@@ -195,7 +195,7 @@ public abstract class MobSpawnerAbstract {
+@@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract {
      }
  
      private void a(Entity entity) {

Spigot-Server-Patches/0427-Activation-Range-Improvements.patch

@@ -1,4 +1,4 @@
-From 28760f56aef1d90ac4fbddd6700109149c412bbc Mon Sep 17 00:00:00 2001
+From 9cff84dfbe2d85247d2fef7d73a6b65816b24586 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
@@ -10,10 +10,10 @@ Fixes and adds new Immunities to improve gameplay behavior
 Adds water Mobs to activation range config and nerfs fish
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6b5e92de0..2e4b50a19 100644
+index 2c8603e2fc..659591e028 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -554,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -553,6 +553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.recalcPosition();
          } else {
              if (enummovetype == EnumMoveType.PISTON) {
@@ -22,7 +22,7 @@ index 6b5e92de0..2e4b50a19 100644
                  if (vec3d.equals(Vec3D.a)) {
                      return;
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index b40c8d2f8..4eda13075 100644
+index b40c8d2f83..4eda130750 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -34,10 +34,10 @@ index b40c8d2f8..4eda13075 100644
      protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index cc10db88b..e54f1e840 100644
+index 6d53254f83..1991cee43d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -112,6 +112,17 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -114,6 +114,17 @@ public abstract class EntityInsentient extends EntityLiving {
          return this.lookController;
      }
  
@@ -56,7 +56,7 @@ index cc10db88b..e54f1e840 100644
          if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) {
              EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle();
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 6d4d41c88..193dbfc5f 100644
+index 6d4d41c88c..193dbfc5f6 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -382,6 +382,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -68,7 +68,7 @@ index 6d4d41c88..193dbfc5f 100644
          return this.bJ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index f22f12eeb..bdb90a346 100644
+index f22f12eeb0..bdb90a3466 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -20,7 +20,10 @@ public abstract class PathfinderGoal {
@@ -84,7 +84,7 @@ index f22f12eeb..bdb90a346 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index 41fb166ce..e93129f0b 100644
+index 41fb166ce0..e93129f0b2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -4,12 +4,12 @@ import java.util.EnumSet;
@@ -125,7 +125,7 @@ index 41fb166ce..e93129f0b 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 44bb18c59..935136771 100644
+index 44bb18c594..935136771e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -24,10 +24,11 @@ public class PathfinderGoalSelector {
@@ -169,7 +169,7 @@ index 44bb18c59..935136771 100644
          this.d.stream().filter((pathfindergoalwrapped) -> {
              return pathfindergoalwrapped.j() == pathfindergoal;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 5a8c60ad9..29657fed7 100644
+index 5a8c60ad90..29657fed75 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -64,6 +64,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
@@ -181,7 +181,7 @@ index 5a8c60ad9..29657fed7 100644
          return this.c;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 92601c581..6e165a164 100644
+index 92601c581c..6e165a1649 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -33,12 +33,18 @@ import net.minecraft.server.MathHelper;
@@ -274,7 +274,7 @@ index 92601c581..6e165a164 100644
              isActive = false;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 58767972a..3ceeed3f9 100644
+index 58767972a3..3ceeed3f99 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -180,6 +180,7 @@ public class SpigotWorldConfig

Spigot-Server-Patches/0431-Fix-items-vanishing-through-end-portal.patch

@@ -1,4 +1,4 @@
-From ce57854db81fc6045f10a12adb97ee48e4e9e657 Mon Sep 17 00:00:00 2001
+From 2b30fb352322421afc2a38a0db9985631a17d6f4 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Wed, 22 Jan 2020 19:52:28 -0600
 Subject: [PATCH] Fix items vanishing through end portal
@@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2e4b50a19..acb7848d8 100644
+index 659591e028..6e41a55065 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2600,6 +2600,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2599,6 +2599,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          if (blockposition == null) { // CraftBukkit
              if (dimensionmanager1.getType() == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) { // CraftBukkit

Spigot-Server-Patches/0440-Add-option-to-nerf-pigmen-from-nether-portals.patch

@@ -1,11 +1,11 @@
-From 08779e78d78ba929585b2d141dbafb9e168cd6c5 Mon Sep 17 00:00:00 2001
+From 70fb304ade7af87eea921577b824bf5b9cb4ccdc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Feb 2020 14:36:56 -0600
 Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bce502181..7d408542e 100644
+index bce502181f..7d408542e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -653,4 +653,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index bce502181..7d408542e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
-index 2dc3ab4cf..5e3ac055d 100644
+index 2dc3ab4cfa..09c7c13183 100644
 --- a/src/main/java/net/minecraft/server/BlockPortal.java
 +++ b/src/main/java/net/minecraft/server/BlockPortal.java
 @@ -45,6 +45,8 @@ public class BlockPortal extends Block {
@@ -27,24 +27,23 @@ index 2dc3ab4cf..5e3ac055d 100644
  
                  if (entity != null) {
 +                    entity.fromNetherPortal = true; // Paper
-+                    if (worldserver.paperConfig.nerfNetherPortalPigmen) entity.nerfFromNetherPortal = true; // Paper
++                    if (worldserver.paperConfig.nerfNetherPortalPigmen) ((EntityInsentient) entity).aware = false; // Paper
                      entity.portalCooldown = entity.ba();
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index acb7848d8..a855d743a 100644
+index 6e41a55065..8974c16bf9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -194,6 +194,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -193,6 +193,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+     public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
-     public boolean fromMobSpawner;
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
 +    public boolean fromNetherPortal; // Paper
-+    public boolean nerfFromNetherPortal; // Paper
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1638,6 +1640,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1637,6 +1638,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (spawnedViaMobSpawner) {
                  nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
              }
@@ -54,28 +53,14 @@ index acb7848d8..a855d743a 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1760,6 +1765,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1759,6 +1763,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
  
              spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
 +            fromNetherPortal = nbttagcompound.getBoolean("Paper.FromNetherPortal");
-+            nerfFromNetherPortal = fromNetherPortal && world.paperConfig.nerfNetherPortalPigmen;
              if (nbttagcompound.hasKey("Paper.SpawnReason")) {
                  String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason");
                  try {
-diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e54f1e840..2cee73ace 100644
---- a/src/main/java/net/minecraft/server/EntityInsentient.java
-+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -658,7 +658,7 @@ public abstract class EntityInsentient extends EntityLiving {
-     protected final void doTick() {
-         ++this.ticksFarFromPlayer;
-         // Spigot Start
--        if ( this.fromMobSpawner )
-+        if ( this.fromMobSpawner || this.nerfFromNetherPortal ) // Paper
-         {
-             // Paper start - Allow nerfed mobs to jump, float and take water damage
-             if (goalFloat != null) {
 -- 
 2.25.0
 

work/Bukkit

@@ -1 +1 @@
-Subproject commit 337955e3aaa71021164f5fef3ad5f2f9af8bb62c
+Subproject commit f52c70ab17a6da19b235abf1c7a360b02c248021

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 918061b75c32244c0e9099926cba94ffb4b2c51d
+Subproject commit fba9f4876b0fb4e86d169f144276866668f58aca

work/Spigot

@@ -1 +1 @@
-Subproject commit c574e08b715634fcaee82dea911226f8194362a8
+Subproject commit 8faa8b45b477f6804c52184fe1a6bec9bf1dff65