[Auto] Updated Upstream (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 Spigot Changes: 2474d93d SPIGOT-4462: Catch async chunk regenerate
2018-11-03 05:31:30 -04:00 · 2018-11-03 05:31:30 -04:00 · aaefc4fbbe
Commit aaefc4fbbe
--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From e203155d1c320112cc87545f45d9112de0e0e302 Mon Sep 17 00:00:00 2001
+From 0bb895c191ceed2d9b40ade7f2b5c8f68f5cb500 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 17755108a..6fe3c0ea8 100644
+index 17755108a8..6fe3c0ea8a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -244,4 +244,10 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 17755108a..6fe3c0ea8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5e7a68c4b..18635e820 100644
+index 5e7a68c4b4..18635e8207 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -490,13 +490,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -63,7 +63,7 @@ index 5e7a68c4b..18635e820 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7d83c0236..466ea22be 100644
+index 7d83c02363..466ea22be2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2902,8 +2902,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -78,7 +78,7 @@ index 7d83c0236..466ea22be 100644
 
     public LongSet ag() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d277a640c..8ce32dcff 100644
+index d277a640cc..8ce32dcffd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1001,7 +1001,7 @@ public final class CraftServer implements Server {
@ -91,10 +91,10 @@ index d277a640c..8ce32dcff 100644
             for (int j = -short1; j <= short1; j += 16) {
                 for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 887894005..5d8e85a0a 100644
+index a784bf6f68..24e504c279 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1403,8 +1403,9 @@ public class CraftWorld implements World {
+@@ -1404,8 +1404,9 @@ public class CraftWorld implements World {
         int chunkCoordX = chunkcoordinates.getX() >> 4;
         int chunkCoordZ = chunkcoordinates.getZ() >> 4;
         // Cycle through the 25x25 Chunks around it to load/unload the chunks.
--- a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@ -1,4 +1,4 @@
-From b0efda0569a3f5e6285e5fb2abd2bb310d5a1565 Mon Sep 17 00:00:00 2001
+From f74f5f78131c69430ee9281954378ee943a085a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -20,7 +20,7 @@ This also makes the Chunk GC System useless, by auto scheduling unload as soon a
 a spare chunk is added to the server thats outside of view distance.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ff1a2046f..0cd15c17e 100644
+index ff1a2046f6..0cd15c17e8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -296,4 +296,18 @@ public class PaperWorldConfig {
@ -43,7 +43,7 @@ index ff1a2046f..0cd15c17e 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 28ec8628d..234c9eb1c 100644
+index 28ec8628dc..234c9eb1c3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -36,6 +36,7 @@ public class Chunk implements IChunkAccess {
@ -55,7 +55,7 @@ index 28ec8628d..234c9eb1c 100644
     public final int locZ;
     private boolean l;
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 71ddaf591..39ac032b0 100644
+index 71ddaf591e..39ac032b0b 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -48,6 +48,15 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@ -75,7 +75,7 @@ index 71ddaf591..39ac032b0 100644
         // CraftBukkit end
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 42d0731f0..e32c9f9a6 100644
+index 42d0731f0a..e32c9f9a62 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -306,6 +306,19 @@ public class ChunkProviderServer implements IChunkProvider {
@ -99,7 +99,7 @@ index 42d0731f0..e32c9f9a6 100644
             this.chunkScheduler.a(booleansupplier);
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ac0e90eec..2fd8fa30e 100644
+index ac0e90eeca..2fd8fa30ee 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -33,8 +33,22 @@ public class PlayerChunk {
@ -160,7 +160,7 @@ index ac0e90eec..2fd8fa30e 100644
         }
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 1318ddd99..bc67565bf 100644
+index 1318ddd997..bc67565bf0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -460,7 +460,13 @@ public class PlayerChunkMap {
@ -179,7 +179,7 @@ index 1318ddd99..bc67565bf 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8aa4138a2..225f7574d 100644
+index 8aa4138a2e..225f7574d2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1342,7 +1342,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -198,10 +198,10 @@ index 8aa4138a2..225f7574d 100644
                         this.methodProfiler.a(() -> {
                             return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5d8e85a0a..178f462c4 100644
+index 24e504c279..f0e974dffc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1756,7 +1756,7 @@ public class CraftWorld implements World {
+@@ -1757,7 +1757,7 @@ public class CraftWorld implements World {
         ChunkProviderServer cps = world.getChunkProviderServer();
         for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
             // If in use, skip it
@ -211,7 +211,7 @@ index 5d8e85a0a..178f462c4 100644
             }
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index dfa59bbdd..8f0a999b0 100644
+index dfa59bbddc..8f0a999b0c 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -319,6 +319,11 @@ public class ActivationRange
--- a/Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,4 +1,4 @@
-From c4483daa6889091ddc0b123bb58dfd4877ff6cf4 Mon Sep 17 00:00:00 2001
+From 81bce8cfb6769d7e35c26f0b79f226e78ff8b41f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.

 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index bb8b450ac..163ce42c6 100644
+index bb8b450ac4..163ce42c61 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -454,13 +454,13 @@ public class Block implements IMaterial {
@ -28,7 +28,7 @@ index bb8b450ac..163ce42c6 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 69c8e245b..8993fe1ad 100644
+index 69c8e245bd..8993fe1add 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@ -41,7 +41,7 @@ index 69c8e245b..8993fe1ad 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 1e25ade7c..3e2312b86 100644
+index 1e25ade7cf..3e2312b866 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@ -120,7 +120,7 @@ index 1e25ade7c..3e2312b86 100644
 
     public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index e33ecfcda..b164aff93 100644
+index e33ecfcda7..b164aff93f 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity {
@ -133,7 +133,7 @@ index e33ecfcda..b164aff93 100644
                     // CraftBukkit end
                     if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b2b575d0e..48bb14805 100644
+index b2b575d0e8..48bb14805e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity {
@ -147,7 +147,7 @@ index b2b575d0e..48bb14805 100644
             this.expToDrop = 0;
             // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index a5e1939e0..e73dba09a 100644
+index a5e1939e05..e73dba09a6 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
@@ -36,7 +36,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@ -160,7 +160,7 @@ index a5e1939e0..e73dba09a 100644
 
             this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f05a1483f..70f54b1fb 100644
+index f05a1483ff..70f54b1fb9 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -411,7 +411,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -173,7 +173,7 @@ index f05a1483f..70f54b1fb 100644
 
         if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 4a128f707..b87096467 100644
+index 4a128f707b..b870964674 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
@@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@ -186,7 +186,7 @@ index 4a128f707..b87096467 100644
                 // CraftBukkit end
             }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index c8cfa3abe..aa7780eff 100644
+index c8cfa3abe4..aa7780eff5 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -390,7 +390,7 @@ public class PlayerInteractManager {
@ -199,7 +199,7 @@ index c8cfa3abe..aa7780eff 100644
                 // CraftBukkit end
 
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 22c47c63c..52e296d46 100644
+index 22c47c63c7..52e296d468 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
@@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@ -221,10 +221,10 @@ index 22c47c63c..52e296d46 100644
             }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d4627dbe0..bdcbef8dc 100644
+index 3a30349f4e..e1c09452b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1338,7 +1338,7 @@ public class CraftWorld implements World {
+@@ -1339,7 +1339,7 @@ public class CraftWorld implements World {
         } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
             entity = new EntityTNTPrimed(world, x, y, z, null);
         } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@ -234,7 +234,7 @@ index d4627dbe0..bdcbef8dc 100644
             // not sure what this can do
             if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3d..3302af0e4 100644
+index 3a09cab3d4..3302af0e45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
@@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
--- a/Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -1,4 +1,4 @@
-From 893e727e1f192d8b040c9947d818862524ccacff Mon Sep 17 00:00:00 2001
+From 1f1c12ca7a9dc9d35d582850db5c44623e22f1a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 682e0b87e..a5dfc1ebf 100644
+index 682e0b87ea..a5dfc1ebf5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1206,12 +1206,17 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -34,10 +34,10 @@ index 682e0b87e..a5dfc1ebf 100644
 
             if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bdcbef8dc..4bd6b2376 100644
+index e1c09452b7..84bde3ef20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1745,11 +1745,17 @@ public class CraftWorld implements World {
+@@ -1746,11 +1746,17 @@ public class CraftWorld implements World {
 
     @Override
     public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
--- a/Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@ -1,4 +1,4 @@
-From 4fb00387c71a4eee750e7649ef522e8c481fab24 Mon Sep 17 00:00:00 2001
+From 8a1594063a6ad06f391b3614c7c45ae24342e8b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4bd6b2376..aec0bb395 100644
+index 84bde3ef20..e127cc91ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1054,6 +1054,10 @@ public class CraftWorld implements World {
+@@ -1055,6 +1055,10 @@ public class CraftWorld implements World {
         if (Boat.class.isAssignableFrom(clazz)) {
             entity = new EntityBoat(world, x, y, z);
             entity.setPositionRotation(x, y, z, yaw, pitch);
--- a/Spigot-Server-Patches/0276-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0276-Expand-Explosions-API.patch
@ -1,4 +1,4 @@
-From 7206df2c7f5cbc0925ae55a706e870f35dea2681 Mon Sep 17 00:00:00 2001
+From ae111c2505930a400cfe893885976c3557707640 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index aec0bb395..d3abaa9b6 100644
+index e127cc91ef..d6f9953777 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -523,6 +523,11 @@ public class CraftWorld implements World {
+@@ -524,6 +524,11 @@ public class CraftWorld implements World {
     public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
         return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
     }
--- a/Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
@ -1,14 +1,14 @@
-From a06fff08f38b167f4a333c2ea0a949197ef1f5cd Mon Sep 17 00:00:00 2001
+From 61cf48e76ea55f17222b189250e28f216aecb30a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d3abaa9b6..be8cc2510 100644
+index d6f9953777..a05320c908 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -874,6 +874,14 @@ public class CraftWorld implements World {
+@@ -875,6 +875,14 @@ public class CraftWorld implements World {
         return list;
     }
 
--- a/Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
@ -1,4 +1,4 @@
-From 2df6c84b94bf4d4c4e2b28e8b59c479128c63d57 Mon Sep 17 00:00:00 2001
+From 66d3435a1ece49d458f7629024e1679208783a4c 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 56700fc59..9b9c8361e 100644
+index 56700fc596..9b9c8361e9 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,7 +23,7 @@ index 56700fc59..9b9c8361e 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 8fa36cd65..0de0dc293 100644
+index 8fa36cd65e..0de0dc2936 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -123,6 +123,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -35,7 +35,7 @@ index 8fa36cd65..0de0dc293 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 965a598db..2aa4946c7 100644
+index 965a598db9..2aa4946c75 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1112,6 +1112,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -71,10 +71,10 @@ index 965a598db..2aa4946c7 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 be8cc2510..a99aabc40 100644
+index a05320c908..2acd8a4b31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -618,6 +618,7 @@ public class CraftWorld implements World {
+@@ -619,6 +619,7 @@ public class CraftWorld implements World {
         for (Object o : world.entityList) {
             if (o instanceof net.minecraft.server.Entity) {
                 net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -82,7 +82,7 @@ index be8cc2510..a99aabc40 100644
                 Entity bukkitEntity = mcEnt.getBukkitEntity();
 
                 // Assuming that bukkitEntity isn't null
-@@ -636,6 +637,7 @@ public class CraftWorld implements World {
+@@ -637,6 +638,7 @@ public class CraftWorld implements World {
         for (Object o : world.entityList) {
             if (o instanceof net.minecraft.server.Entity) {
                 net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -90,7 +90,7 @@ index be8cc2510..a99aabc40 100644
                 Entity bukkitEntity = mcEnt.getBukkitEntity();
 
                 // Assuming that bukkitEntity isn't null
-@@ -660,6 +662,7 @@ public class CraftWorld implements World {
+@@ -661,6 +663,7 @@ public class CraftWorld implements World {
 
         for (Object entity: world.entityList) {
             if (entity instanceof net.minecraft.server.Entity) {
@ -98,7 +98,7 @@ index be8cc2510..a99aabc40 100644
                 Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
 
                 if (bukkitEntity == null) {
-@@ -682,6 +685,7 @@ public class CraftWorld implements World {
+@@ -683,6 +686,7 @@ public class CraftWorld implements World {
 
         for (Object entity: world.entityList) {
             if (entity instanceof net.minecraft.server.Entity) {
--- a/Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
@ -1,11 +1,11 @@
-From f74ab97dfef96770cc68a42f8489e33a06367943 Mon Sep 17 00:00:00 2001
+From 87004adf14a118f365884bf9f68541b72f87c314 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list


 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 813f6d1fd..73bd0dc4a 100644
+index 813f6d1fd3..73bd0dc4a1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1202,8 +1202,25 @@ public abstract class PlayerList {
@ -46,7 +46,7 @@ index 813f6d1fd..73bd0dc4a 100644
                 double d5 = d1 - entityplayer.locY;
                 double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
-index e26405d34..23f390c22 100644
+index e26405d341..23f390c221 100644
 --- a/src/main/java/net/minecraft/server/WorldManager.java
 +++ b/src/main/java/net/minecraft/server/WorldManager.java
@@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@ -95,7 +95,7 @@ index e26405d34..23f390c22 100644
             if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
                 double d0 = (double) blockposition.getX() - entityplayer.locX;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 17758c813..6e54b71e8 100644
+index 17758c8134..6e54b71e88 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -119,10 +119,10 @@ index 17758c813..6e54b71e8 100644
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a99aabc40..98efce511 100644
+index 2acd8a4b31..4237e5e3c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1620,7 +1620,7 @@ public class CraftWorld implements World {
+@@ -1621,7 +1621,7 @@ public class CraftWorld implements World {
         double z = loc.getZ();
 
         PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);
--- a/Spigot-Server-Patches/0345-Implement-Force-Loaded-Chunk-API.patch
+++ b/Spigot-Server-Patches/0345-Implement-Force-Loaded-Chunk-API.patch
@ -1,11 +1,11 @@
-From 6efe491434ee66156df70829d328ebdbb690c1ac Mon Sep 17 00:00:00 2001
+From 15713ce4147d9658c1be331ce9a245016cb094c9 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Wed, 29 Aug 2018 00:37:42 -0400
 Subject: [PATCH] Implement Force-Loaded Chunk API


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 12c6d850d..b9371e3ae 100644
+index 12c6d850d2..b9371e3ae9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -289,6 +289,18 @@ public class CraftChunk implements Chunk {
@ -28,10 +28,10 @@ index 12c6d850d..b9371e3ae 100644
         Arrays.fill(emptySkyLight, (byte) 0xFF);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 98efce511..13d1551bb 100644
+index 4237e5e3c4..d5936eb199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -570,6 +570,12 @@ public class CraftWorld implements World {
+@@ -571,6 +571,12 @@ public class CraftWorld implements World {
         return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
     }
 
--- a/Spigot-Server-Patches/0350-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0350-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@ -1,4 +1,4 @@
-From 5a696ec8fd7df7fcf0d684c7552e3ab765d5d29d Mon Sep 17 00:00:00 2001
+From 61bb26690d5a5a2c0fbb4094c481fc56d8a16142 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2f034a9fa..604d1dbb3 100644
+index 4b8b66352b..7e6a7b0e90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -294,7 +294,7 @@ public class CraftWorld implements World {
+@@ -295,7 +295,7 @@ public class CraftWorld implements World {
     public boolean loadChunk(int x, int z, boolean generate) {
         org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot
         chunkLoadCount++;
--- a/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0371-Async-Chunk-Loading-and-Generation.patch
@ -1,4 +1,4 @@
-From e0e4f447246b2747683ec10f598abca50cc5fe85 Mon Sep 17 00:00:00 2001
+From 9ecc0a1f12bc2050abbfe0f14b5b602a4f72c82b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@ -2323,7 +2323,7 @@ index 6d72db7bd3..32bf4e589c 100644
             }
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9c266b4502..f3a9649ef6 100644
+index 7e6a7b0e90..ef5a7bc38a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -162,6 +162,16 @@ public class CraftWorld implements World {
@ -2343,7 +2343,7 @@ index 9c266b4502..f3a9649ef6 100644
     public Chunk getChunkAt(int x, int z) {
         return this.world.getChunkProviderServer().getChunkAt(x, z, true, true).bukkitChunk;
     }
-@@ -1456,10 +1466,13 @@ public class CraftWorld implements World {
+@@ -1457,10 +1467,13 @@ public class CraftWorld implements World {
         int chunkCoordZ = chunkcoordinates.getZ() >> 4;
         // Cycle through the 25x25 Chunks around it to load/unload the chunks.
         int radius = world.paperConfig.keepLoadedRange / 16; // Paper
--- a/Spigot-Server-Patches/0383-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0383-Add-sun-related-API.patch
@ -1,11 +1,11 @@
-From 8c3d9461870510ba987413468271da3a71df7021 Mon Sep 17 00:00:00 2001
+From 4c9116f3e592f2ce2708d593e0379be42d0a43fc 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 5aea6629f..fd4a77c1a 100644
+index 5aea6629f2..fd4a77c1a9 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1286,6 +1286,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -17,7 +17,7 @@ index 5aea6629f..fd4a77c1a 100644
         if (this.world.L() && !this.world.isClientSide) {
             float f = this.az();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 23529954b..7914f9b60 100644
+index 23529954b4..7914f9b606 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -29,10 +29,10 @@ index 23529954b..7914f9b60 100644
         return this.G < 4;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f3a9649ef..9f3d87217 100644
+index ef5a7bc38a..10fa122536 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -522,6 +522,12 @@ public class CraftWorld implements World {
+@@ -523,6 +523,12 @@ public class CraftWorld implements World {
         }
     }
 
@ -46,7 +46,7 @@ index f3a9649ef..9f3d87217 100644
         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..40a429942 100644
+index 53c2d154ed..40a429942e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
--- a/Spigot-Server-Patches/0401-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0401-Use-EntityTypes-for-living-entities.patch
@ -1,11 +1,11 @@
-From b1ec360d827b7964d124ac30a4bee31f689886b5 Mon Sep 17 00:00:00 2001
+From 5714958d604d901151f4be130994de76272fb091 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities


 diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
-index 5a0cc6d05..d385f647e 100644
+index 5a0cc6d058..d385f647e7 100644
 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
@@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block {
@ -18,7 +18,7 @@ index 5a0cc6d05..d385f647e 100644
             entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
             world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
 diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
-index f7ea9f9b8..dfa3bd685 100644
+index f7ea9f9b82..dfa3bd685c 100644
 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
@@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@ -40,7 +40,7 @@ index f7ea9f9b8..dfa3bd685 100644
                 entityirongolem.setPlayerCreated(true);
                 entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index 924d15649..9e9fa7d58 100644
+index 924d15649a..9e9fa7d581 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -84,7 +84,7 @@ public class BlockTurtleEgg extends Block {
@ -53,7 +53,7 @@ index 924d15649..9e9fa7d58 100644
                         entityturtle.setAgeRaw(-24000);
                         entityturtle.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
-index 7904b1262..38fc40e50 100644
+index 7904b12623..38fc40e502 100644
 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
@@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull {
@ -66,7 +66,7 @@ index 7904b1262..38fc40e50 100644
 
                 entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index e083ea483..56bd827e3 100644
+index e083ea483a..56bd827e32 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -361,7 +361,7 @@ public class EnderDragonBattle {
@ -79,7 +79,7 @@ index e083ea483..56bd827e3 100644
         entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
         this.d.addEntity(entityenderdragon);
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index efb728d04..3bfbf4752 100644
+index efb728d04d..3bfbf4752d 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal {
@ -92,7 +92,7 @@ index efb728d04..3bfbf4752 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index b2e50f853..9c7bf12b8 100644
+index b2e50f8532..9c7bf12b88 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal {
@ -105,7 +105,7 @@ index b2e50f853..9c7bf12b8 100644
 
     public float getHeadHeight() {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index c82b5f3ab..ba53e9b0b 100644
+index c82b5f3aba..ba53e9b0ba 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
@@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile {
@ -118,7 +118,7 @@ index c82b5f3ab..ba53e9b0b 100644
                             entityendermite.a(true);
                             entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 2d9631c5d..16d94fe3f 100644
+index 2d9631c5d5..16d94fe3f4 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -221,7 +221,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@ -131,7 +131,7 @@ index 2d9631c5d..16d94fe3f 100644
                 entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null);
                 entityvex.a(EntityEvoker.this);
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index 51a07311f..f20196388 100644
+index 51a07311f7..f201963888 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -205,10 +205,10 @@ public class EntityHorse extends EntityHorseAbstract {
@ -148,7 +148,7 @@ index 51a07311f..f20196388 100644
             int i;
             if (j < 4) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 50c0a8277..627ba1038 100644
+index 50c0a82777..627ba10383 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
@@ -38,7 +38,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@ -161,7 +161,7 @@ index 50c0a8277..627ba1038 100644
         return (EntityAgeable)object;
     }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index ba6c0e96a..17850e857 100644
+index ba6c0e96a3..17850e8576 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@ -174,7 +174,7 @@ index ba6c0e96a..17850e857 100644
 
     public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index 560eac4af..4b928d2c7 100644
+index 560eac4af1..4b928d2c78 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -40,7 +40,7 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@ -187,7 +187,7 @@ index 560eac4af..4b928d2c7 100644
 
     public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 774e4d641..0cf53b69f 100644
+index 774e4d6414..0cf53b69f5 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -272,7 +272,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@ -200,7 +200,7 @@ index 774e4d641..0cf53b69f 100644
         EntityLlama entityllama2 = (EntityLlama)entityageable;
         int i = this.random.nextInt(Math.max(this.getStrength(), entityllama2.getStrength())) + 1;
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 13a6ddac5..d02455b39 100644
+index 13a6ddac59..d02455b39e 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -35,7 +35,7 @@ public class EntityMushroomCow extends EntityCow {
@ -222,7 +222,7 @@ index 13a6ddac5..d02455b39 100644
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index d2e25f04b..90a7e00a0 100644
+index d2e25f04b7..90a7e00a05 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -244,7 +244,7 @@ index d2e25f04b..90a7e00a0 100644
                 entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                 entityocelot.setAgeRaw(-24000);
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index b405e63e8..b0802e12d 100644
+index b405e63e81..b0802e12d9 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -150,7 +150,7 @@ public class EntityPig extends EntityAnimal {
@ -266,7 +266,7 @@ index b405e63e8..b0802e12d 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index b9124a5b0..cb3e45f14 100644
+index b9124a5b0d..cb3e45f14f 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
@@ -15,7 +15,7 @@ public class EntityPolarBear extends EntityAnimal {
@ -279,7 +279,7 @@ index b9124a5b0..cb3e45f14 100644
 
     public boolean f(ItemStack var1) {
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index b8ca53003..747409af0 100644
+index b8ca530034..747409af02 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal {
@ -292,7 +292,7 @@ index b8ca53003..747409af0 100644
 
         if (this.random.nextInt(20) != 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index 4a9a9f9da..db4c3aa60 100644
+index 4a9a9f9da0..db4c3aa604 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -264,7 +264,7 @@ public class EntitySheep extends EntityAnimal {
@ -305,7 +305,7 @@ index 4a9a9f9da..db4c3aa60 100644
         entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
         return entitysheep1;
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index 761c94bdf..ffbd572dd 100644
+index 761c94bdf3..ffbd572ddb 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster {
@ -318,7 +318,7 @@ index 761c94bdf..ffbd572dd 100644
             entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
             entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 2c1db9b78..0d88314de 100644
+index 2c1db9b782..0d88314de3 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal {
@ -331,7 +331,7 @@ index 2c1db9b78..0d88314de 100644
 
     public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 6b6fbfd79..29d5ef4c1 100644
+index 6b6fbfd79b..29d5ef4c1c 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -269,6 +269,7 @@ public class EntityTypes<T extends Entity> {
@ -343,7 +343,7 @@ index 6b6fbfd79..29d5ef4c1 100644
     public T a(World world) {
         return this.aT.apply(world); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index c7d6aa238..5435d3980 100644
+index c7d6aa238d..5435d39809 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -596,7 +596,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -365,7 +365,7 @@ index c7d6aa238..5435d3980 100644
             // Paper start
             if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index af9aef76f..68db6af62 100644
+index af9aef76f8..68db6af622 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -343,7 +343,7 @@ public class EntityWolf extends EntityTameableAnimal {
@ -378,7 +378,7 @@ index af9aef76f..68db6af62 100644
 
         if (uuid != null) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 04d25ad76..c6413ef2a 100644
+index 04d25ad76a..c6413ef2a9 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -209,7 +209,7 @@ public class EntityZombie extends EntityMonster {
@ -418,7 +418,7 @@ index 04d25ad76..c6413ef2a 100644
                     entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                     entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 85d402965..0cca7b6d5 100644
+index 85d402965b..0cca7b6d51 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
@@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie {
@ -431,7 +431,7 @@ index 85d402965..0cca7b6d5 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index c1f8984a0..786ab0b29 100644
+index c1f8984a0f..786ab0b290 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -114,7 +114,7 @@ public class EntityZombieVillager extends EntityZombie {
@ -444,7 +444,7 @@ index c1f8984a0..786ab0b29 100644
         entityvillager.u(this);
         entityvillager.setProfession(this.getProfession());
 diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
-index 9e4078148..a4fab5c23 100644
+index 9e40781488..a4fab5c23a 100644
 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java
 +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
@@ -34,7 +34,7 @@ public class ItemArmorStand extends Item {
@ -457,7 +457,7 @@ index 9e4078148..a4fab5c23 100644
 
                         entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 413188e97..476b840ae 100644
+index 413188e970..476b840ae8 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
@@ -59,7 +59,7 @@ public class MobSpawnerPhantom {
@ -470,7 +470,7 @@ index 413188e97..476b840ae 100644
                                                 entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
                                                 groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index d4fdcbdfd..887e4461f 100644
+index d4fdcbdfd6..887e4461f3 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
@@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@ -492,7 +492,7 @@ index d4fdcbdfd..887e4461f 100644
         entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
         entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ);
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 560edb523..f9b58b972 100644
+index 560edb523f..f9b58b9729 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
@@ -134,7 +134,7 @@ public class VillageSiege {
@ -505,7 +505,7 @@ index 560edb523..f9b58b972 100644
             } catch (Exception exception) {
                 exception.printStackTrace();
 diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
-index d53911594..83f55adba 100644
+index d53911594d..83f55adbad 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
@@ -174,7 +174,7 @@ public class WorldGenEndCityPieces {
@ -527,7 +527,7 @@ index d53911594..83f55adba 100644
                 entityshulker.g(blockposition);
                 generatoraccess.addEntity(entityshulker);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
-index 50fe0e16b..ceb37aab4 100644
+index 50fe0e16b3..ceb37aab4e 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
@@ -146,7 +146,7 @@ public class WorldGenFeatureOceanRuinPieces {
@ -540,7 +540,7 @@ index 50fe0e16b..ceb37aab4 100644
                 entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F);
                 entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity)null, (NBTTagCompound)null);
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
-index 6ab249ee7..c9a17e332 100644
+index 6ab249ee7f..c9a17e3326 100644
 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
@@ -37,7 +37,7 @@ public class WorldGenMonumentPieces {
@ -580,7 +580,7 @@ index 6ab249ee7..c9a17e332 100644
             for(WorldGenMonumentPieces.WorldGenMonumentStateTracker worldgenmonumentpieces$worldgenmonumentstatetracker4 : aworldgenmonumentpieces$worldgenmonumentstatetracker) {
                 if (worldgenmonumentpieces$worldgenmonumentstatetracker4 != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
-index e327e2a28..c63b535ee 100644
+index e327e2a283..c63b535ee0 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
@@ -1656,7 +1656,7 @@ public class WorldGenVillagePieces {
@ -602,7 +602,7 @@ index e327e2a28..c63b535ee 100644
                         entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
                         entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
 diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
-index a05e0657b..7062b0cec 100644
+index a05e0657bc..7062b0cec2 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
@@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
@ -615,7 +615,7 @@ index a05e0657b..7062b0cec 100644
                     entitywitch.di();
                     entitywitch.setPositionRotation((double) i + 0.5D, (double) j, (double) k + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
-index ee401980f..9ca9306d0 100644
+index ee401980fe..9ca9306d09 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
@@ -197,7 +197,7 @@ public class WorldGenWoodlandMansionPieces {
@ -686,7 +686,7 @@ index ee401980f..9ca9306d0 100644
                 entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
                 entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity)null, (NBTTagCompound)null);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 818e4c376..4f9029c33 100644
+index 818e4c376d..4f9029c33a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -511,7 +511,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -699,10 +699,10 @@ index 818e4c376..4f9029c33 100644
                             entityhorseskeleton.s(true);
                             entityhorseskeleton.setAgeRaw(0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9f3d87217..0eb23d52c 100644
+index 10fa122536..bd118f7f0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1171,153 +1171,153 @@ public class CraftWorld implements World {
+@@ -1172,153 +1172,153 @@ public class CraftWorld implements World {
             entity.setPositionRotation(x, y, z, 0, 0);
         } else if (LivingEntity.class.isAssignableFrom(clazz)) {
             if (Chicken.class.isAssignableFrom(clazz)) {
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit 117d4f7e219c6aecf6c56980f6c6926792e431ef
+Subproject commit 2474d93d1f81af864f0e81b6d29cef31760069a6