From 96ce4bd9fd9c6fc307ef851b815fb0582920ae31 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 30 Jul 2018 20:19:41 -0500
Subject: [PATCH] Update upstream B/CB

---
 .../0002-Paper-config-files.patch             |  8 +--
 ...-MinecraftKey-Information-to-Objects.patch | 20 +++---
 ...to-current-Chunk-for-Entity-and-Bloc.patch | 16 ++---
 Spigot-Server-Patches/0009-Timings-v2.patch   | 68 +++++++++----------
 ...ck-and-tnt-entities-at-the-specified.patch | 14 ++--
 .../0023-Entity-Origin-API.patch              | 24 +++----
 ...nfigurable-top-of-nether-void-damage.patch | 16 ++---
 ...oreboards-for-non-players-by-default.patch | 12 ++--
 ...078-Use-a-Shared-Random-for-Entities.patch | 10 +--
 .../0079-Don-t-teleport-dead-entities.patch   |  8 +--
 ...nilla-per-world-scoreboard-coloring-.patch | 12 ++--
 .../0114-Entity-Tracking-Improvements.patch   | 10 +--
 ...1-Optional-TNT-doesn-t-move-in-water.patch | 14 ++--
 ...5-Don-t-let-fishinghooks-use-portals.patch | 10 +--
 ...llow-entities-to-ride-themselves-572.patch |  8 +--
 .../0175-Cap-Entity-Collisions.patch          | 12 ++--
 .../0194-Entity-fromMobSpawner.patch          | 16 ++---
 ...emove-entities-on-dimension-teleport.patch | 10 +--
 ...-more-information-to-Entity.toString.patch |  8 +--
 ...ies-option-to-debug-dupe-uuid-issues.patch | 10 +--
 .../0302-Duplicate-UUID-Resolve-Option.patch  | 16 ++---
 ...9-Vanished-players-don-t-have-rights.patch | 10 +--
 ...dd-some-Debug-to-Chunk-Entity-slices.patch | 10 +--
 ...ead-Entities-in-entityList-iteration.patch | 14 ++--
 ...cess-chunk-registration-after-moving.patch | 14 ++--
 ...322-MC-111480-Start-Entity-ID-s-at-1.patch |  8 +--
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 28 files changed, 191 insertions(+), 191 deletions(-)

diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index 0f7f64592..0c6cf67ae 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 316df958ca5c55a2535278f3d212b045aa149d88 Mon Sep 17 00:00:00 2001
+From 0a99f65b3af82daaf174c4c389994abaf8acffac Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -519,10 +519,10 @@ index 5ff1e9686..3706e44a3 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 34d6ad182..b8eb89240 100644
+index 55bf00be9..a1050912b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -134,9 +134,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      private static final DataWatcherObject<Boolean> aG = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> aH = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      public boolean inChunk;
@@ -696,5 +696,5 @@ index 9128f7754..7b1a9a8a0 100644
          config.addDefault( "world-settings.default." + path, def );
          return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
index 478e2dc09..5e9b2e045 100644
--- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
+++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
@@ -1,4 +1,4 @@
-From 04982f8161c4fa45ebd2115b734a9f72cd35790c Mon Sep 17 00:00:00 2001
+From 4bffc6c4381b8f560de9b87dae45060fa43bf997 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 e8f7b7292d..7ff8e70b24 100644
+index e8f7b7292..7ff8e70b2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -171,7 +171,7 @@ public class PaperCommand extends Command {
@@ -19,10 +19,10 @@ index e8f7b7292d..7ff8e70b24 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 ef21637c44..5faaf3b199 100644
+index a1050912b..7e691baf9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -45,7 +45,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
+@@ -46,7 +46,7 @@ import org.bukkit.event.entity.EntityPortalEvent;
  import org.bukkit.plugin.PluginManager;
  // CraftBukkit end
  
@@ -31,7 +31,7 @@ index ef21637c44..5faaf3b199 100644
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -73,7 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -74,7 +74,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      private static final AxisAlignedBB b = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
      private static double c = 1.0D;
      private static int entityCount;
@@ -40,7 +40,7 @@ index ef21637c44..5faaf3b199 100644
      private int id;
      public boolean j;
      public final List<Entity> passengers;
-@@ -1762,12 +1762,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1763,12 +1763,29 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
@@ -75,7 +75,7 @@ index ef21637c44..5faaf3b199 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 9a513b4e3a..fa268f3543 100644
+index 9a513b4e3..fa268f354 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -238,6 +238,7 @@ public class EntityTypes<T extends Entity> {
@@ -88,7 +88,7 @@ index 9a513b4e3a..fa268f3543 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 0000000000..743142d030
+index 000000000..743142d03
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/KeyedObject.java
 @@ -0,0 +1,9 @@
@@ -102,7 +102,7 @@ index 0000000000..743142d030
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8a0453245d..5ca7fef518 100644
+index 8a0453245..5ca7fef51 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -7,11 +7,11 @@ import org.apache.logging.log4j.Logger;
@@ -147,5 +147,5 @@ index 8a0453245d..5ca7fef518 100644
      public World getWorld() {
          return this.world;
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index 3ebccc0aa..203efcde0 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -1,4 +1,4 @@
-From bda9bfa66f13a5452e94d471c406ea177822827e Mon Sep 17 00:00:00 2001
+From 9194ef5bb3a3499c930324ad6b4451399c8d84fa 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 2d06202da7..8d9aa271a1 100644
+index 2d06202da..8d9aa271a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess {
@@ -94,10 +94,10 @@ index 2d06202da7..8d9aa271a1 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5faaf3b199..8934ff699b 100644
+index 7e691baf9..19109ee1d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -133,7 +133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private static final DataWatcherObject<Boolean> aF = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> aG = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
      private static final DataWatcherObject<Boolean> aH = DataWatcher.a(Entity.class, DataWatcherRegistry.i);
@@ -106,7 +106,7 @@ index 5faaf3b199..8934ff699b 100644
      public int ae; public int getChunkX() { return ae; } // Paper - OBFHELPER
      public int af; public int getChunkY() { return af; } // Paper - OBFHELPER
      public int ag; public int getChunkZ() { return ag; } // Paper - OBFHELPER
-@@ -1763,6 +1763,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1764,6 +1764,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
@@ -147,7 +147,7 @@ index 5faaf3b199..8934ff699b 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 5ca7fef518..9361667c3b 100644
+index 5ca7fef51..9361667c3 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -167,7 +167,7 @@ index 5ca7fef518..9361667c3b 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 b542b17fd0..9fc7ac8c02 100644
+index b542b17fd..9fc7ac8c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -9,6 +9,7 @@ import java.util.UUID;
@@ -192,5 +192,5 @@ index b542b17fd0..9fc7ac8c02 100644
          /**
           * Order is *EXTREMELY* important -- keep it right! =D
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 8169d8ebc..a78c50eaa 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 9f38656090ca3c9125d795061af4c51544f9265e Mon Sep 17 00:00:00 2001
+From 2efeec193a426c688e23ba85468062130ccf379b 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 0000000000..4f624e39c7
+index 000000000..4f624e39c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,125 @@
@@ -137,7 +137,7 @@ index 0000000000..4f624e39c7
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 0000000000..0bb63600f3
+index 000000000..0bb63600f
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,180 @@
@@ -323,7 +323,7 @@ index 0000000000..0bb63600f3
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 0000000000..145cb274b0
+index 000000000..145cb274b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,104 @@
@@ -432,7 +432,7 @@ index 0000000000..145cb274b0
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b89ec42525..e4ed7d674e 100644
+index b89ec4252..e4ed7d674 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;
@@ -476,7 +476,7 @@ index b89ec42525..e4ed7d674e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 06f10e1e84..43feccef8f 100644
+index 06f10e1e8..43feccef8 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -28,8 +28,16 @@ public class Block implements IMaterial {
@@ -499,7 +499,7 @@ index 06f10e1e84..43feccef8f 100644
          Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap = new Object2ByteLinkedOpenHashMap(200) {
              protected void rehash(int i) {}
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 027b7cce98..4e51bd301a 100644
+index 027b7cce9..4e51bd301 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -530,7 +530,7 @@ index 027b7cce98..4e51bd301a 100644
          // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 00cd8d8cea..aabdc9e2f0 100644
+index 00cd8d8ce..aabdc9e2f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -122,14 +122,13 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -560,7 +560,7 @@ index 00cd8d8cea..aabdc9e2f0 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 88301ee61e..5001fd11dc 100644
+index 88301ee61..5001fd11d 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -607,7 +607,7 @@ index 88301ee61e..5001fd11dc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 3706e44a34..bf1fffcfee 100644
+index 3706e44a3..bf1fffcfe 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@@ -660,7 +660,7 @@ index 3706e44a34..bf1fffcfee 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8934ff699b..31b612d516 100644
+index 19109ee1d..7c238d728 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;
@@ -673,7 +673,7 @@ index 8934ff699b..31b612d516 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -159,7 +160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -160,7 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public boolean valid;
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
@@ -682,7 +682,7 @@ index 8934ff699b..31b612d516 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -540,7 +541,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -541,7 +542,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
@@ -690,7 +690,7 @@ index 8934ff699b..31b612d516 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().d(d0, d1, d2));
              this.recalcPosition();
-@@ -889,7 +889,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -890,7 +890,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.methodProfiler.e();
          }
@@ -699,7 +699,7 @@ index 8934ff699b..31b612d516 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 514c951516..d6e9915c1f 100644
+index 514c95151..d6e9915c1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -775,7 +775,7 @@ index 514c951516..d6e9915c1f 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index ae31935c48..70c9b1f50c 100644
+index ae31935c4..70c9b1f50 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -168,7 +168,7 @@ public class EntityTracker {
@@ -806,7 +806,7 @@ index ae31935c48..70c9b1f50c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d453d0c421..83a73b86ea 100644
+index d453d0c42..83a73b86e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -960,7 +960,7 @@ index d453d0c421..83a73b86ea 100644
          this.methodProfiler.e();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ac6d8cc6e6..d975c2ccf1 100644
+index ac6d8cc6e..d975c2ccf 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -1054,7 +1054,7 @@ index ac6d8cc6e6..d975c2ccf1 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 42e0630e60..5d42cfe81c 100644
+index 42e0630e6..5d42cfe81 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1093,7 +1093,7 @@ index 42e0630e60..5d42cfe81c 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 889b32287e..69da194f52 100644
+index 889b32287..69da194f5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,11 +1,17 @@
@@ -1116,7 +1116,7 @@ index 889b32287e..69da194f52 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e476d3433b..9cef6b9af6 100644
+index e476d3433..9cef6b9af 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1140,7 +1140,7 @@ index e476d3433b..9cef6b9af6 100644
  
      public WhiteList getWhitelist() {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index a07895935e..ee5c2421bb 100644
+index a07895935..ee5c2421b 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@@ -1194,7 +1194,7 @@ index a07895935e..ee5c2421bb 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 9361667c3b..0d54513a44 100644
+index 9361667c3..0d54513a4 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1214,7 +1214,7 @@ index 9361667c3b..0d54513a44 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e1cf1e579a..3cb7c1d540 100644
+index e1cf1e579..3cb7c1d54 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1329,7 +1329,7 @@ index e1cf1e579a..3cb7c1d540 100644
  
      public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2c6f6de4ce..f032ecab64 100644
+index 2c6f6de4c..f032ecab6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1445,7 +1445,7 @@ index 2c6f6de4ce..f032ecab64 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4c1486a38e..ebc2d690b0 100644
+index 4c1486a38..ebc2d690b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1839,12 +1839,31 @@ public final class CraftServer implements Server {
@@ -1482,7 +1482,7 @@ index 4c1486a38e..ebc2d690b0 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 4c8ab2bc97..0000000000
+index 4c8ab2bc9..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -1661,7 +1661,7 @@ index 4c8ab2bc97..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 413dd35f06..52a8c48fa4 100644
+index 413dd35f0..52a8c48fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1697,7 +1697,7 @@ index 413dd35f06..52a8c48fa4 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2d09bb4fab..3dc76f7dd6 100644
+index 2d09bb4fa..3dc76f7dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1708,6 +1708,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1714,7 +1714,7 @@ index 2d09bb4fab..3dc76f7dd6 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 f11bd7545f..93b9134d6e 100644
+index f11bd7545..93b9134d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1790,7 +1790,7 @@ index f11bd7545f..93b9134d6e 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 7e7ce9a81b..46029ce246 100644
+index 7e7ce9a81..46029ce24 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1872,7 +1872,7 @@ index 7e7ce9a81b..46029ce246 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b78..3d90b34268 100644
+index e52ef47b7..3d90b3426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1884,7 +1884,7 @@ index e52ef47b78..3d90b34268 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e60fe5a920..f68e42c4d4 100644
+index e60fe5a92..f68e42c4d 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
@@ -1945,5 +1945,5 @@ index e60fe5a920..f68e42c4d4 100644
      }
  }
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 785ea75b8..d4ed1cd00 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,11 +1,11 @@
-From 8057f460fde7cbe69626c2e6897585b128fc7496 Mon Sep 17 00:00:00 2001
+From 12112e5c3e7cc51ef4a93b606052097a421c0896 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 cef0c47ac7..38a697e1b7 100644
+index cef0c47ac..38a697e1b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -114,4 +114,14 @@ public class PaperWorldConfig {
@@ -24,10 +24,10 @@ index cef0c47ac7..38a697e1b7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 31b612d516..d0535bf160 100644
+index 7c238d728..334f7403f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1866,6 +1866,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1867,6 +1867,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
@@ -36,7 +36,7 @@ index 31b612d516..d0535bf160 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 e7e7d57c48..5e01aa0f85 100644
+index e7e7d57c4..5e01aa0f8 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -86,6 +86,17 @@ public class EntityFallingBlock extends Entity {
@@ -58,7 +58,7 @@ index e7e7d57c48..5e01aa0f85 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 7edc028527..5ceb3f2068 100644
+index 7edc02852..5ceb3f206 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -57,6 +57,13 @@ public class EntityTNTPrimed extends Entity {
@@ -76,5 +76,5 @@ index 7edc028527..5ceb3f2068 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
index 0d1fa4f5f..ec5407dfb 100644
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,14 +1,14 @@
-From ae313c17800421f9c254c21750a19b85db89e5b9 Mon Sep 17 00:00:00 2001
+From 580473495d8bc3798ec58d731342c35d82c5a306 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 d0535bf160..37392bdf20 100644
+index 334f7403f..106cf19d8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -161,6 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -162,6 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
      public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
@@ -16,7 +16,7 @@ index d0535bf160..37392bdf20 100644
      // Spigot start
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1606,6 +1607,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1607,6 +1608,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  }
              }
  
@@ -28,7 +28,7 @@ index d0535bf160..37392bdf20 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1748,6 +1754,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1749,6 +1755,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index d0535bf160..37392bdf20 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1823,6 +1836,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1824,6 +1837,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -51,7 +51,7 @@ index d0535bf160..37392bdf20 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 5e01aa0f85..33bc46b054 100644
+index 5e01aa0f8..33bc46b05 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -249,6 +249,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index 5e01aa0f85..33bc46b054 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 5ceb3f2068..87f3205f82 100644
+index 5ceb3f206..87f3205f8 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -109,6 +109,14 @@ public class EntityTNTPrimed extends Entity {
@@ -89,7 +89,7 @@ index 5ceb3f2068..87f3205f82 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index a8280acf94..38dd8f17a6 100644
+index a8280acf9..38dd8f17a 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -182,6 +182,7 @@ public class NBTTagList extends NBTList<NBTBase> {
@@ -101,7 +101,7 @@ index a8280acf94..38dd8f17a6 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d0516b0885..6bb52c7d4d 100644
+index d0516b088..6bb52c7d4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -951,6 +951,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -118,7 +118,7 @@ index d0516b0885..6bb52c7d4d 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9fc7ac8c02..249d8115e8 100644
+index 9fc7ac8c0..249d8115e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -787,4 +787,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -135,5 +135,5 @@ index 9fc7ac8c02..249d8115e8 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index c8a5ddbf2..ddbc324de 100644
--- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,11 +1,11 @@
-From c30ee8d5915f87ff6f3b77284e50d8a53965f4fa Mon Sep 17 00:00:00 2001
+From 7c9730ec3c04293e069dc8a489a3e3f370fb7a26 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 38a697e1b7..68898d624f 100644
+index 38a697e1b..68898d624 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -124,4 +124,10 @@ public class PaperWorldConfig {
@@ -20,10 +20,10 @@ index 38a697e1b7..68898d624f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 37392bdf20..e5e4437332 100644
+index 106cf19d8..c7acd0629 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -461,9 +461,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -462,9 +462,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.fallDistance *= 0.5F;
          }
  
@@ -39,7 +39,7 @@ index 37392bdf20..e5e4437332 100644
  
          if (!this.world.isClientSide) {
              this.setFlag(0, this.fireTicks > 0);
-@@ -473,6 +479,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -474,6 +480,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.world.methodProfiler.e();
      }
  
@@ -54,7 +54,7 @@ index 37392bdf20..e5e4437332 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -529,6 +543,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -530,6 +544,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
@@ -63,7 +63,7 @@ index 37392bdf20..e5e4437332 100644
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 6e48cf4751..4644d7efe3 100644
+index 6e48cf475..4644d7efe 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -201,9 +201,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@@ -83,5 +83,5 @@ index 6e48cf4751..4644d7efe3 100644
          int i;
  
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
index 885a75bce..2061f9285 100644
--- a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From d58a95bd0ff1060723ed73b6745f35f4550bb395 Mon Sep 17 00:00:00 2001
+From 616dad11fb49cd3991ecc2afe098217fb088584a 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 4a2d296746..2b25da0465 100644
+index 4a2d29674..2b25da046 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -193,4 +193,9 @@ public class PaperWorldConfig {
@@ -25,10 +25,10 @@ index 4a2d296746..2b25da0465 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e5e4437332..4ae39ba9b3 100644
+index c7acd0629..27020c7e2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2240,6 +2240,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2248,6 +2248,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase be() {
@@ -37,7 +37,7 @@ index e5e4437332..4ae39ba9b3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 574883462d..dd48c6af0c 100644
+index 574883462..dd48c6af0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -537,6 +537,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,5 +49,5 @@ index 574883462d..dd48c6af0c 100644
  
              if (!flag) {
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
index f1170ef85..823b8c14c 100644
--- a/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 58f22d3cd3c6775a56674da5767cefe141436d8b Mon Sep 17 00:00:00 2001
+From 368053f43ba373d4b5c106fcd7390d8ea5fedfea 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,10 +6,10 @@ 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 4ae39ba9b3..77c5b34286 100644
+index 27020c7e2..07172d3dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -50,6 +50,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -51,6 +51,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
@@ -30,7 +30,7 @@ index 4ae39ba9b3..77c5b34286 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -183,7 +197,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -184,7 +198,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.length = 1.8F;
          this.aA = 1.0F;
          this.aB = 1.0F;
@@ -40,5 +40,5 @@ index 4ae39ba9b3..77c5b34286 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
index 2e1b5604b..4ab5930e1 100644
--- a/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 3c89785b87c8e201dd3aed8bf3879bb898336d30 Mon Sep 17 00:00:00 2001
+From 910a0f2540abd19874fa2bff7109b5006b195846 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 77c5b34286..1f2981529e 100644
+index 07172d3dd..53ef6b0ed 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2557,7 +2557,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2565,7 +2565,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
@@ -20,5 +20,5 @@ index 77c5b34286..1f2981529e 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index c5cc911aa..82aad63de 100644
--- a/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,11 +1,11 @@
-From c43b466a7fb9981256385d2d6c1bd6abc75e743e Mon Sep 17 00:00:00 2001
+From 3123ef38d15374e24c3991a323acd6dda9c13ce9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 667a0dde8c..b6ef1d4378 100644
+index 667a0dde8..b6ef1d437 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -239,4 +239,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index 667a0dde8c..b6ef1d4378 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1f2981529e..f694463d20 100644
+index 53ef6b0ed..da1254f5e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2252,6 +2252,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2260,6 +2260,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.getFlag(5);
      }
  
@@ -31,7 +31,7 @@ index 1f2981529e..f694463d20 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 90ab7f065f..1ca3c87c7a 100644
+index 90ab7f065..1ca3c87c7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1622,7 +1622,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -52,5 +52,5 @@ index 90ab7f065f..1ca3c87c7a 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
index 1729de72a..bd86198f8 100644
--- a/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From a4ca6f81234296ae1cfb63d2e7a2344d48456e67 Mon Sep 17 00:00:00 2001
+From 694f896ba3bde5f9ad486dd58a1539808807026e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,10 +7,10 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 76934f81a8..93df154b15 100644
+index da1254f5e..428eaca37 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -70,6 +70,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected CraftEntity bukkitEntity;
  
@@ -19,7 +19,7 @@ index 76934f81a8..93df154b15 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index a04a06f3bf..c405cc74ba 100644
+index a04a06f3b..c405cc74b 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -49,6 +49,7 @@ public class EntityTrackerEntry {
@@ -99,5 +99,5 @@ index a04a06f3bf..c405cc74ba 100644
  
      }
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
index e96fc3617..92711995a 100644
--- a/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From f10aef89a91ed3e191c69f92352a56970f8a5a95 Mon Sep 17 00:00:00 2001
+From 06776dc5112fcd1549743f82548ec21ac49fdc86 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 a3823408ca..41e73b3409 100644
+index a3823408c..41e73b340 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 a3823408ca..41e73b3409 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c2e6272804..a39152e117 100644
+index 428eaca37..964caa080 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1172,6 +1172,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1173,6 +1173,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean aq() {
@@ -48,7 +48,7 @@ index c2e6272804..a39152e117 100644
          return this.isInWater() || this.q();
      }
  
-@@ -2718,6 +2724,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2726,6 +2732,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean bw() {
@@ -61,7 +61,7 @@ index c2e6272804..a39152e117 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 87f3205f82..8c1d25979f 100644
+index 87f3205f8..8c1d25979 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
@@ -115,5 +115,5 @@ index 87f3205f82..8c1d25979f 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
index 9bba7a93f..44573cbef 100644
--- a/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
@@ -1,14 +1,14 @@
-From 458307a35436678f93443b917ff19d94e341a212 Mon Sep 17 00:00:00 2001
+From cb853229070f909198c981bb8c5e2f832cfb0a0b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e56f458ca9..167cbb2820 100644
+index 964caa080..c28723158 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -157,7 +157,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public boolean ak;
      public boolean impulse;
      public int portalCooldown;
@@ -18,7 +18,7 @@ index e56f458ca9..167cbb2820 100644
      public int dimension;
      protected BlockPosition aq;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 7c119282b9..4f801e8fec 100644
+index 7c119282b..4f801e8fe 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -190,6 +190,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 7c119282b9..4f801e8fec 100644
      }
  
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
index 17da80fad..e019dddfc 100644
--- a/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,14 +1,14 @@
-From 21d1fb00e372eb869d84e295e926e705cefaab60 Mon Sep 17 00:00:00 2001
+From f9d2d9f925eb02c27f49d8d87515ce82eaad0488 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 b430fe1337..71ae40aae6 100644
+index c28723158..3955884e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2069,6 +2069,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2077,6 +2077,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected void o(Entity entity) {
@@ -17,5 +17,5 @@ index b430fe1337..71ae40aae6 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
index 36f7ae781..3bca13f45 100644
--- a/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 255be07d1698feb90a2de0b84e6d11f76ba1ed56 Mon Sep 17 00:00:00 2001
+From 848af308b3d283aef53aa7a3ef34d261219da3bd 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 b95f259a9a..4991138dfe 100644
+index b95f259a9..4991138df 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -344,4 +344,10 @@ public class PaperWorldConfig {
@@ -27,10 +27,10 @@ index b95f259a9a..4991138dfe 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 71ae40aae6..0484aa381b 100644
+index 3955884e1..33683301b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
      public boolean fromMobSpawner;
@@ -39,7 +39,7 @@ index 71ae40aae6..0484aa381b 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f9a76ce27c..3b4867bfc9 100644
+index f9a76ce27..3b4867bfc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2318,8 +2318,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index f9a76ce27c..3b4867bfc9 100644
                  this.C(entity);
              }
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
index b38f8c3ed..b3d5ed92c 100644
--- a/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
@@ -1,14 +1,14 @@
-From c2df3eb88d3f965d4c60e056307e7753bf3e4c8c Mon Sep 17 00:00:00 2001
+From 7b0a57312cfc84e35752507c500844cd7d949f3b 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 0484aa381b..89d284fa7e 100644
+index 33683301b..aba517a71 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
      public boolean fromMobSpawner;
@@ -16,7 +16,7 @@ index 0484aa381b..89d284fa7e 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1648,6 +1649,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1649,6 +1650,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index 0484aa381b..89d284fa7e 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1796,6 +1801,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1797,6 +1802,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,7 +37,7 @@ index 0484aa381b..89d284fa7e 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 61472a0eb2..2b6b062c61 100644
+index 61472a0eb..2b6b062c6 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index 61472a0eb2..2b6b062c61 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index dedf1526e6..2801e34f6b 100644
+index dedf1526e..2801e34f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -826,5 +826,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,5 +64,5 @@ index dedf1526e6..2801e34f6b 100644
      // Paper end
  }
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
index 9cc3d63d7..b59407cf8 100644
--- a/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From 87ca24731083dde07c9007597285ecce4bcd6af4 Mon Sep 17 00:00:00 2001
+From b21ff381ce087be18a69f1285ac39e6a5bf3a8b6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -22,10 +22,10 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 89d284fa7e..ffc92a6edc 100644
+index aba517a71..20c2bf16b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2588,7 +2588,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2596,7 +2596,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
              // CraftBukkit end */
  
@@ -35,7 +35,7 @@ index 89d284fa7e..ffc92a6edc 100644
              this.world.methodProfiler.a("reposition");
              /* CraftBukkit start - Handled in calculateTarget
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d506503e93..697296acd0 100644
+index d506503e9..697296acd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1025,6 +1025,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -47,5 +47,5 @@ index d506503e93..697296acd0 100644
          this.entitiesById.d(entity.getId());
          this.entitiesByUUID.remove(entity.getUniqueID());
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
index 918198cc7..5866f5317 100644
--- a/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 02b7efd5e03d5ed806722f1182602d21c532da6a Mon Sep 17 00:00:00 2001
+From 3a1524a0f125d522af37f20b2df0d44861ba3eaf 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 ffc92a6edc..e47687d399 100644
+index 20c2bf16b..835d329f9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2487,7 +2487,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2495,7 +2495,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
@@ -19,5 +19,5 @@ index ffc92a6edc..e47687d399 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index a45f35960..f20a148a3 100644
--- a/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From 92aaeae9ce1a4ceaf3e1e9ec95789677187ece51 Mon Sep 17 00:00:00 2001
+From 6b67d1f666bc517ea49fd5822edc2f5cfb08f36c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a2101d44f9..f05545e357 100644
+index 835d329f9..ff22feee4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      protected CraftEntity bukkitEntity;
  
      EntityTrackerEntry tracker; // Paper
@@ -18,7 +18,7 @@ index a2101d44f9..f05545e357 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b048343b7c..747d99dbe6 100644
+index b048343b7..747d99dbe 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -53,6 +53,10 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -84,5 +84,5 @@ index b048343b7c..747d99dbe6 100644
  
          if (aentity != null) {
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
index bf6b06f64..a3ce14a36 100644
--- a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From cba824c7d5ebb95ca2eff42bbe03b129409632e8 Mon Sep 17 00:00:00 2001
+From 389db970dedee85efee0802e63c40bd36ca9d40b 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 7bd7aa0d94..5d9bed3f19 100644
+index 7bd7aa0d9..5d9bed3f1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -430,4 +430,40 @@ public class PaperWorldConfig {
@@ -78,7 +78,7 @@ index 7bd7aa0d94..5d9bed3f19 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1997cbdc65..114a13b625 100644
+index 1997cbdc6..114a13b62 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -149,10 +149,10 @@ index 1997cbdc65..114a13b625 100644
              this.world.a((Collection) entityslice);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 347273b553..69e0cf85c8 100644
+index ff22feee4..9ab635058 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2716,6 +2716,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2724,6 +2724,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
@@ -161,7 +161,7 @@ index 347273b553..69e0cf85c8 100644
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1295078cd4..25362ff8e2 100644
+index 1295078cd..25362ff8e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -72,7 +72,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -174,7 +174,7 @@ index 1295078cd4..25362ff8e2 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> c = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 747d99dbe6..7a9f28421b 100644
+index 747d99dbe..7a9f28421 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -40,7 +40,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -220,5 +220,5 @@ index 747d99dbe6..7a9f28421b 100644
              logger.error("Overwrote an existing entity " + old + " with " + entity);
              if (DEBUG_ENTITIES) {
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0309-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0309-Vanished-players-don-t-have-rights.patch
index c3da63915..4a9a97389 100644
--- a/Spigot-Server-Patches/0309-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0309-Vanished-players-don-t-have-rights.patch
@@ -1,14 +1,14 @@
-From 23fec8c52c0ad980ac17d08cb534cf203dc04d6a Mon Sep 17 00:00:00 2001
+From 26d01acf2550d31956c23abe48f53a3a84c18ce3 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2217ca973..184d46191 100644
+index 9ab635058..4315804dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private static int entityCount;
      private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
      private int id;
@@ -64,7 +64,7 @@ index 53c9f2188..71e408432 100644
          return this.a.a();
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 40943f809..71b3aedfb 100644
+index 47b9f1c47..52cf52ea7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1556,6 +1556,37 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -125,5 +125,5 @@ index cf398cd25..140ddae0d 100644
          return event;
      }
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0312-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0312-Add-some-Debug-to-Chunk-Entity-slices.patch
index 1b3b6257b..fe36781dd 100644
--- a/Spigot-Server-Patches/0312-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0312-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 7d7344bc52e21efffa59a82f694fbd085c43a41f Mon Sep 17 00:00:00 2001
+From c77d662147a1ed8f12c92092b0fc71754f24430d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 92a3c8b5d7..6d4b9adff0 100644
+index 92a3c8b5d..6d4b9adff 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -712,8 +712,33 @@ public class Chunk implements IChunkAccess {
@@ -69,10 +69,10 @@ index 92a3c8b5d7..6d4b9adff0 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fdd9c1f219..3faa28593e 100644
+index 4315804dd..785c31089 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -64,6 +64,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              }
          }
      };
@@ -81,5 +81,5 @@ index fdd9c1f219..3faa28593e 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch
index c5e180d63..c57029a74 100644
--- a/Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From d6b6d12dc73d9d270533fd1bb90ecc52ec9f2559 Mon Sep 17 00:00:00 2001
+From 711c9c234823b69b6c3833b270619973c47a3f21 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 7ff8e70b24..4e854c6dbe 100644
+index 7ff8e70b2..4e854c6db 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@@ -23,10 +23,10 @@ index 7ff8e70b24..4e854c6dbe 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 181a9b7546..3a6ada187b 100644
+index 785c31089..6b0ca4eb9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -121,6 +121,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -122,6 +122,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      protected boolean F;
      private boolean az;
      public boolean dead;
@@ -35,7 +35,7 @@ index 181a9b7546..3a6ada187b 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f8458a2b49..ece1871294 100644
+index f8458a2b4..ece187129 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1141,6 +1141,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -63,7 +63,7 @@ index f8458a2b49..ece1871294 100644
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f4dc7e4ac6..8923df898f 100644
+index f4dc7e4ac..8923df898 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -660,6 +660,7 @@ public class CraftWorld implements World {
@@ -99,5 +99,5 @@ index f4dc7e4ac6..8923df898f 100644
  
                  if (bukkitEntity == null) {
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch b/Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch
index 642a32131..956c66e8d 100644
--- a/Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch
+++ b/Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch
@@ -1,4 +1,4 @@
-From ce2e7e90417950771a00802c97dd23db3dd314a7 Mon Sep 17 00:00:00 2001
+From 7397f8f996dcff94bd805f8fe91c2b87d76d42f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 11:58:05 -0400
 Subject: [PATCH] Always process chunk registration after moving
@@ -7,10 +7,10 @@ This will help guarantee that entities are always in the
 chunk that they are currently located at.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5c2e80d6ba..037e6ebae8 100644
+index 6b0ca4eb9..68b4a902e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -339,6 +339,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -340,6 +340,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.locX = d0;
          this.locY = d1;
          this.locZ = d2;
@@ -18,7 +18,7 @@ index 5c2e80d6ba..037e6ebae8 100644
          float f = this.width / 2.0F;
          float f1 = this.length;
  
-@@ -937,6 +938,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -938,6 +939,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.locX = (axisalignedbb.a + axisalignedbb.d) / 2.0D;
          this.locY = axisalignedbb.b;
          this.locZ = (axisalignedbb.c + axisalignedbb.f) / 2.0D;
@@ -27,7 +27,7 @@ index 5c2e80d6ba..037e6ebae8 100644
  
      protected SoundEffect ad() {
 diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java
-index f2d3d0b4c7..f20060614d 100644
+index f2d3d0b4c..f20060614 100644
 --- a/src/main/java/net/minecraft/server/EntityLeash.java
 +++ b/src/main/java/net/minecraft/server/EntityLeash.java
 @@ -31,6 +31,7 @@ public class EntityLeash extends EntityHanging {
@@ -39,7 +39,7 @@ index f2d3d0b4c7..f20060614d 100644
  
      public void setDirection(EnumDirection enumdirection) {}
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index 95c6cd8971..bc11e7da2b 100644
+index 95c6cd897..bc11e7da2 100644
 --- a/src/main/java/net/minecraft/server/EntityShulker.java
 +++ b/src/main/java/net/minecraft/server/EntityShulker.java
 @@ -385,6 +385,7 @@ public class EntityShulker extends EntityGolem implements IMonster {
@@ -51,5 +51,5 @@ index 95c6cd8971..bc11e7da2b 100644
                  this.lastY = this.locY;
                  this.lastZ = this.locZ;
 -- 
-2.18.0
+2.17.1
 
diff --git a/Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch
index 19a098bef..7f6a532ab 100644
--- a/Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 54ed0870dbbf50b0bbfdf73c5738a2ed82fb6fe7 Mon Sep 17 00:00:00 2001
+From 28bf6810434ad2518f42c9fd90582a0e53790baf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,10 +7,10 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 037e6ebae8..ac0af4695c 100644
+index 68b4a902e..ce33cd5b8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -90,7 +90,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -91,7 +91,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private static final List<ItemStack> a = Collections.emptyList();
      private static final AxisAlignedBB b = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
      private static double c = 1.0D;
@@ -20,5 +20,5 @@ index 037e6ebae8..ac0af4695c 100644
      private int id;
      public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
 -- 
-2.18.0
+2.17.1
 
diff --git a/work/Bukkit b/work/Bukkit
index cf6548b4f..61e81e746 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit cf6548b4fd81f5be6a243eaf00da815c76611495
+Subproject commit 61e81e7467cfd84c311509af20ae5dd7bbbc9aaf
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 3f9d7f777..549d9b012 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3f9d7f7770c2c700ef1cc2e9568cfb253996eff8
+Subproject commit 549d9b012078466bd36c6185fe6e1a4bcf311b8c