Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
867794b2 Make setPersistent also control player saving

CraftBukkit Changes:
02518f92 Make setPersistent also control player saving

Spigot-API-Patches/0006-Entity-Origin-API.patch

@@ -1,14 +1,14 @@
-From 9318c7b2806647ec99349588486dd9f4dab0f763 Mon Sep 17 00:00:00 2001
+From afc54113a05902a020f9d36d62e7de74fce3f3b2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e7d0ceb44..ce22ded94 100644
+index 0263e9cc..a2714118 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -545,4 +545,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -546,4 +546,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      @Override
      Spigot spigot();
      // Spigot end
@@ -25,7 +25,7 @@ index e7d0ceb44..ce22ded94 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 0cd830d90..170a9aee5 100644
+index 0cd830d9..170a9aee 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -51,4 +51,15 @@ public interface FallingBlock extends Entity {
@@ -45,7 +45,7 @@ index 0cd830d90..170a9aee5 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index fcd0a9b2f..2abef57c9 100644
+index fcd0a9b2..2abef57c 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
 @@ -35,4 +35,15 @@ public interface TNTPrimed extends Explosive {
@@ -65,5 +65,5 @@ index fcd0a9b2f..2abef57c9 100644
 +    }
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-API-Patches/0058-Entity-fromMobSpawner.patch

@@ -1,14 +1,14 @@
-From 5738a5cbdbddb664a0392738369b750d28712ad7 Mon Sep 17 00:00:00 2001
+From 573401ed73ea3117352b8c823b91e807052363c3 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/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index ce22ded94..64f72ff83 100644
+index a2714118..6bdbd7ab 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -555,5 +555,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -556,5 +556,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       * @return Location where entity originates or null if not yet added
       */
      Location getOrigin();
@@ -22,5 +22,5 @@ index ce22ded94..64f72ff83 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-API-Patches/0119-Entity-getChunk-API.patch

@@ -1,4 +1,4 @@
-From b1a6336cdd49f20687339e79f653f81c43953848 Mon Sep 17 00:00:00 2001
+From 2cb5b1bda018ce49ec34c527b63a8848990a01ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 64f72ff83..72ebe35fb 100644
+index 6bdbd7ab..66904a0c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1,5 +1,6 @@
@@ -16,7 +16,7 @@ index 64f72ff83..72ebe35fb 100644
  import org.bukkit.Location;
  import org.bukkit.EntityEffect;
  import org.bukkit.Nameable;
-@@ -562,5 +563,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -563,5 +564,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
@@ -30,5 +30,5 @@ index 64f72ff83..72ebe35fb 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,4 +1,4 @@
-From f8e6bf89950a7fef6a1f05d8e973eae16c41acc3 Mon Sep 17 00:00:00 2001
+From 150e167859181f578ce2a73a0382af5291aa72e8 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..a6292f1d74
+index 00000000..a6292f1d
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,132 @@
@@ -144,7 +144,7 @@ index 0000000000..a6292f1d74
 +}
 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 00000000..145cb274
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,104 @@
@@ -253,7 +253,7 @@ index 0000000000..145cb274b0
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d2efcca80a..4812da0dac 100644
+index 6019d582..6ab2eaa1 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;
@@ -297,7 +297,7 @@ index d2efcca80a..4812da0dac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 8811dbc9b3..7818a3b6a7 100644
+index 8811dbc9..7818a3b6 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -23,6 +23,15 @@ public class Block implements IMaterial {
@@ -317,7 +317,7 @@ index 8811dbc9b3..7818a3b6a7 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 6ec067be48..8ba8af2773 100644
+index 9b931716..b81d3792 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -841,6 +841,7 @@ public class Chunk implements IChunkAccess {
@@ -337,7 +337,7 @@ index 6ec067be48..8ba8af2773 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 85a065f039..4b8b77710b 100644
+index 85a065f0..4b8b7771 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> {
@@ -357,7 +357,7 @@ index 85a065f039..4b8b77710b 100644
  
          return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 0c8c10b7a7..31ed3e43a5 100644
+index 0c8c10b7..31ed3e43 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -90,7 +90,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -398,7 +398,7 @@ index 0c8c10b7a7..31ed3e43a5 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 1a32149dbf..43f77a3987 100644
+index 1a32149d..43f77a39 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -445,7 +445,7 @@ index 1a32149dbf..43f77a3987 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index b7cdc495a3..8b9b076ded 100644
+index b7cdc495..8b9b076d 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -13,12 +13,22 @@ public class CustomFunction {
@@ -472,7 +472,7 @@ index b7cdc495a3..8b9b076ded 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 4d7e151793..40ff72f725 100644
+index 4d7e1517..40ff72f7 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -109,7 +109,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@@ -485,7 +485,7 @@ index 4d7e151793..40ff72f725 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index d8535fdd9e..22f3a08e98 100644
+index d8535fdd..22f3a08e 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;
@@ -538,7 +538,7 @@ index d8535fdd9e..22f3a08e98 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 aa9e4ef5ee..320146783b 100644
+index aa9e4ef5..32014678 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;
@@ -577,7 +577,7 @@ index aa9e4ef5ee..320146783b 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 76cc9085bd..ce79887cf4 100644
+index 76cc9085..ce79887c 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;
@@ -653,7 +653,7 @@ index 76cc9085bd..ce79887cf4 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 ae31935c..70c9b1f5 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 {
@@ -684,7 +684,7 @@ index ae31935c48..70c9b1f50c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac534ea3ee..bb4d2cabfe 100644
+index ac534ea3..bb4d2cab 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,6 @@
@@ -837,7 +837,7 @@ index ac534ea3ee..bb4d2cabfe 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 ac6d8cc6..d975c2cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -931,7 +931,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 8db0b6a6db..fa20e1d26c 100644
+index 8db0b6a6..fa20e1d2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -970,7 +970,7 @@ index 8db0b6a6db..fa20e1d26c 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 616797dc6e..3a5daf6705 100644
+index 616797dc..3a5daf67 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,10 +1,16 @@
@@ -991,7 +991,7 @@ index 616797dc6e..3a5daf6705 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ead9697e65..26df2ff32f 100644
+index 6e5922a9..ca129d22 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1001,7 +1001,7 @@ index ead9697e65..26df2ff32f 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1173,10 +1174,11 @@ public abstract class PlayerList {
+@@ -1174,10 +1175,11 @@ public abstract class PlayerList {
      }
  
      public void savePlayers() {
@@ -1015,7 +1015,7 @@ index ead9697e65..26df2ff32f 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 a0789593..ee5c2421 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> {
@@ -1069,7 +1069,7 @@ index a07895935e..ee5c2421bb 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index c69209497b..68ac014aab 100644
+index c6920949..68ac014a 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;
@@ -1089,7 +1089,7 @@ index c69209497b..68ac014aab 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f381e23beb..a934a4b307 100644
+index f381e23b..a934a4b3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1204,7 +1204,7 @@ index f381e23beb..a934a4b307 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 4be2d8d3c4..e4d03b6779 100644
+index 4be2d8d3..e4d03b67 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,6 @@
@@ -1311,7 +1311,7 @@ index 4be2d8d3c4..e4d03b6779 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e659f3f339..944fca34c3 100644
+index e659f3f3..944fca34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1896,12 +1896,31 @@ public final class CraftServer implements Server {
@@ -1348,7 +1348,7 @@ index e659f3f339..944fca34c3 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 4c8ab2bc..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -1527,7 +1527,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 413dd35f..52a8c48f 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 @@
@@ -1563,7 +1563,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 9f78f2c4ae..832d2de476 100644
+index 9f78f2c4..832d2de4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1715,6 +1715,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1582,7 +1582,7 @@ index 9f78f2c4ae..832d2de476 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 f11bd754..93b9134d 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;
@@ -1658,7 +1658,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 7e7ce9a8..46029ce2 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 @@
@@ -1740,7 +1740,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 e52ef47b..3d90b342 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;
@@ -1752,7 +1752,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 e60fe5a9..f68e42c4 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;

Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From 96c325739ed00f1c7e01805d6c3fd11a457faac0 Mon Sep 17 00:00:00 2001
+From 4aa958cd75e6b558fc25887fb204d69eb97fd2a8 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9db394d4ff..50837d767f 100644
+index 9db394d4..50837d76 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -190,4 +190,9 @@ public class PaperWorldConfig {
@@ -30,10 +30,10 @@ index 9db394d4ff..50837d767f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 4320efaef5..9f2c7d3f45 100644
+index 4a843d52..7dfb2bee 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -792,7 +792,7 @@ public abstract class PlayerList {
+@@ -793,7 +793,7 @@ public abstract class PlayerList {
          exitWorld.getTravelAgent().adjustExit(entityplayer, exit, velocity);
  
          entityplayer.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
@@ -43,7 +43,7 @@ index 4320efaef5..9f2c7d3f45 100644
              entityplayer.getBukkitEntity().setVelocity(velocity);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9e51645c30..15a99220ca 100644
+index 9e51645c..15a99220 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -714,7 +714,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From 776221ada4181fe340fa35cdec74b65561f240b4 Mon Sep 17 00:00:00 2001
+From dadab125dda108756e38e52b5b3357370c1dd3c4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 121a87662c..93c964d315 100644
+index db5770ef..233e7c64 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -224,4 +224,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 121a87662c..93c964d315 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8056dc40df..74c84dda69 100644
+index 8056dc40..74c84dda 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -425,6 +425,19 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -43,7 +43,7 @@ index 8056dc40df..74c84dda69 100644
  
      protected void a(File file, WorldData worlddata) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index f7a9b9d885..7befd80cf5 100644
+index f7a9b9d8..7befd80c 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -92,7 +92,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -56,7 +56,7 @@ index f7a9b9d885..7befd80cf5 100644
              packetdataserializer.a(this.c);
              packetdataserializer.a(this.d);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8121f8e40a..02dbb8c6c3 100644
+index 2154c051..baf870ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -74,6 +74,7 @@ public abstract class PlayerList {
@@ -81,7 +81,7 @@ index 8121f8e40a..02dbb8c6c3 100644
          // CraftBukkit - Moved from above, added world
          PlayerList.f.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, Integer.valueOf(entityplayer.getId()), entityplayer.world.worldData.getName(), Double.valueOf(entityplayer.locX), Double.valueOf(entityplayer.locY), Double.valueOf(entityplayer.locZ));
      }
-@@ -423,6 +431,16 @@ public abstract class PlayerList {
+@@ -424,6 +432,16 @@ public abstract class PlayerList {
          entityplayer.playerTick();// SPIGOT-924
          // CraftBukkit end
  
@@ -98,7 +98,7 @@ index 8121f8e40a..02dbb8c6c3 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getRootVehicle();
-@@ -1305,7 +1323,13 @@ public abstract class PlayerList {
+@@ -1306,7 +1324,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end

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

@@ -1,4 +1,4 @@
-From 9d367609530f4ba8a89957561f23040e39b6a265 Mon Sep 17 00:00:00 2001
+From 8c796a83aa01be7157f801a448bebc01918aa003 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4a91a9972d..ec2f0d269b 100644
+index a5fda804..93632dc0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -255,4 +255,15 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index 4a91a9972d..ec2f0d269b 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0cd15c17e8..c43152f456 100644
+index 0cd15c17..c43152f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -64,7 +64,7 @@ index 0cd15c17e8..c43152f456 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 824727ec66..5e6166cfe8 100644
+index bc4d6f12..4748878f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -50,9 +50,9 @@ public class Chunk implements IChunkAccess {
@@ -96,7 +96,7 @@ index 824727ec66..5e6166cfe8 100644
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 719d5deb2c..69219b13a6 100644
+index 719d5deb..69219b13 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -241,7 +241,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -109,7 +109,7 @@ index 719d5deb2c..69219b13a6 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3d83900298..690cff8828 100644
+index 3d839002..690cff88 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -37,6 +37,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -121,7 +121,7 @@ index 3d83900298..690cff8828 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 04d8c108b4..a547ee5ca1 100644
+index 04d8c108..a547ee5c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -148,6 +148,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -168,18 +168,18 @@ index 04d8c108b4..a547ee5ca1 100644
          this.methodProfiler.a("snooper");
          if (getSnooperEnabled() && !this.i.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 02dbb8c6c3..73d72ef7e3 100644
+index baf870ac..7d778ff3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -341,6 +341,7 @@ public abstract class PlayerList {
+@@ -342,6 +342,7 @@ public abstract class PlayerList {
-     }
  
      protected void savePlayerFile(EntityPlayer entityplayer) {
+         if (!entityplayer.getBukkitEntity().isPersistent()) return; // CraftBukkit
 +        entityplayer.lastSave = MinecraftServer.currentTick; // Paper
          this.playerFileData.save(entityplayer);
          ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
  
-@@ -1207,13 +1208,25 @@ public abstract class PlayerList {
+@@ -1208,13 +1209,25 @@ public abstract class PlayerList {
  
      }
  
@@ -207,7 +207,7 @@ index 02dbb8c6c3..73d72ef7e3 100644
      public WhiteList getWhitelist() {
          return this.whitelist;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c5201697d5..ca2e027cda 100644
+index c5201697..ca2e027c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -872,8 +872,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,4 +1,4 @@
-From c64752d30a01b6780d3ade5c23a2e39a04aa2ccd Mon Sep 17 00:00:00 2001
+From 069e181b2583de1377bd1787e0288c38caa51d53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,10 +7,10 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 73d72ef7e3..cc0ed8546f 100644
+index 7d778ff3..06ce2af1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1214,6 +1214,7 @@ public abstract class PlayerList {
+@@ -1215,6 +1215,7 @@ public abstract class PlayerList {
      }
  
      public void savePlayers(Integer interval) {
@@ -18,7 +18,7 @@ index 73d72ef7e3..cc0ed8546f 100644
          long now = MinecraftServer.currentTick;
          MinecraftTimings.savePlayers.startTiming(); // Paper
          int numSaved = 0; // Paper
-@@ -1225,6 +1226,7 @@ public abstract class PlayerList {
+@@ -1226,6 +1227,7 @@ public abstract class PlayerList {
              }
          }
          MinecraftTimings.savePlayers.stopTiming(); // Paper

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

@@ -1,4 +1,4 @@
-From ac8f86f1446a4f0731d3199173c38ed3bff0aa6b Mon Sep 17 00:00:00 2001
+From e95ffc7ab6f240b1bd2c25cef5a931adc5eb0cbd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a547ee5ca1..8d345a0502 100644
+index a547ee5c..8d345a05 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -90,6 +90,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -68,10 +68,10 @@ index a547ee5ca1..8d345a0502 100644
      private boolean aT() {
          return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index cc0ed8546f..a9906f03c9 100644
+index 06ce2af1..e61a6387 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1332,10 +1332,15 @@ public abstract class PlayerList {
+@@ -1333,10 +1333,15 @@ public abstract class PlayerList {
          entityplayer.playerInteractManager.b(generatoraccess.getWorldData().getGameType());
      }
  
@@ -88,7 +88,7 @@ index cc0ed8546f..a9906f03c9 100644
          }
          // CraftBukkit end
          // Paper start - Remove collideRule team if it exists
-@@ -1346,6 +1351,7 @@ public abstract class PlayerList {
+@@ -1347,6 +1352,7 @@ public abstract class PlayerList {
          }
          // Paper end
      }
@@ -97,7 +97,7 @@ index cc0ed8546f..a9906f03c9 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index 947c43a5d0..f15fd9f370 100644
+index 947c43a5..f15fd9f3 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,88 +46,123 @@ public class RestartCommand extends Command

Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch

@@ -1,14 +1,14 @@
-From ad10744ac7a24fc5cb4e4341bc748f5183f3690b Mon Sep 17 00:00:00 2001
+From 356f0298ced084a1e8fb2509ffaef28601ded966 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2f2f301383..304cae655d 100644
+index de549d20..6bdeb2cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -543,9 +543,9 @@ public abstract class PlayerList {
+@@ -544,9 +544,9 @@ public abstract class PlayerList {
  
              // return chatmessage;
              if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage)); // Spigot
@@ -20,7 +20,7 @@ index 2f2f301383..304cae655d 100644
          } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
              IpBanEntry ipbanentry = this.l.get(socketaddress);
  
-@@ -1171,9 +1171,25 @@ public abstract class PlayerList {
+@@ -1172,9 +1172,25 @@ public abstract class PlayerList {
          this.server.getCommandDispatcher().a(entityplayer);
      }
  

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

@@ -1,4 +1,4 @@
-From fb342cc682441b0d700c9597ae40214507b35e87 Mon Sep 17 00:00:00 2001
+From e554948a0ab9794a99d985f39e32de285e8be070 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 175a20e43c..9ba489f356 100644
+index b09aa135..1652d882 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
@@ -29,7 +29,7 @@ index 175a20e43c..9ba489f356 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5e13cb0640..c7dc6fe0ef 100644
+index 5e13cb06..c7dc6fe0 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -162,7 +162,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,7 +56,7 @@ index 5e13cb0640..c7dc6fe0ef 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3644fde3bb..68f5842cfe 100644
+index 3644fde3..68f5842c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -346,7 +346,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -110,7 +110,7 @@ index 3644fde3bb..68f5842cfe 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index da32ed7a01..9819bc0576 100644
+index da32ed7a..9819bc05 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2031,7 +2031,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -123,10 +123,10 @@ index da32ed7a01..9819bc0576 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 304cae655d..6d511b6230 100644
+index 6bdeb2cc..a9b468fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -422,7 +422,7 @@ public abstract class PlayerList {
+@@ -423,7 +423,7 @@ public abstract class PlayerList {
          entityplayer.a(StatisticList.LEAVE_GAME);
  
          // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
@@ -136,7 +136,7 @@ index 304cae655d..6d511b6230 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 32fcba1d1a..3c23d40b1d 100644
+index 32fcba1d..3c23d40b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -417,8 +417,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 32fcba1d1a..3c23d40b1d 100644
      public boolean isBlocking() {
          return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 898371e5f4..912b2e6284 100644
+index 898371e5..912b2e62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -740,7 +740,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index 898371e5f4..912b2e6284 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 66b1293bf9..f04fb045eb 100644
+index 66b1293b..f04fb045 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -930,8 +930,19 @@ public class CraftEventFactory {

Spigot-Server-Patches/0333-Send-nearby-packets-from-world-player-list-not-serve.patch

@@ -1,14 +1,14 @@
-From a9d1decc694859ac7b1a989f6544f33fc9623c66 Mon Sep 17 00:00:00 2001
+From ec6876173a5596cfa16aa9ac22f067b740462caa 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 6d511b6230..d8eb2e9864 100644
+index a9b468fa..9a064d16 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1201,8 +1201,25 @@ public abstract class PlayerList {
+@@ -1202,8 +1202,25 @@ public abstract class PlayerList {
      }
  
      public void sendPacketNearby(@Nullable EntityHuman entityhuman, double d0, double d1, double d2, double d3, DimensionManager dimensionmanager, Packet<?> packet) {
@@ -36,7 +36,7 @@ index 6d511b6230..d8eb2e9864 100644
  
              // CraftBukkit start - Test if player receiving packet can see the source of the packet
              if (entityhuman != null && entityhuman instanceof EntityPlayer && !entityplayer.getBukkitEntity().canSee(((EntityPlayer) entityhuman).getBukkitEntity())) {
-@@ -1210,7 +1227,7 @@ public abstract class PlayerList {
+@@ -1211,7 +1228,7 @@ public abstract class PlayerList {
              }
              // CraftBukkit end
  
@@ -46,7 +46,7 @@ index 6d511b6230..d8eb2e9864 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 e26405d341..23f390c221 100644
+index e26405d3..23f390c2 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 e26405d341..23f390c221 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 9cba1822bf..14905fceb0 100644
+index 9cba1822..14905fce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1090,7 +1090,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -119,7 +119,7 @@ index 9cba1822bf..14905fceb0 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 52d36052b2..8565de51f4 100644
+index 52d36052..8565de51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1497,7 +1497,7 @@ public class CraftWorld implements World {

work/Bukkit

@@ -1 +1 @@
-Subproject commit c71bb9ca986e836fffbd6f118145156e84426e10
+Subproject commit 867794b29b1093f48e53e73cebebb9a871500331

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 68588dac4f57ffda02a84a9c9ed5803322fb5e71
+Subproject commit 02518f92ab38ab37aa7fd3d8609b9fab9a63af40