Fix issues with getBlockState(false) not loading Tile Entity data

This only impacted people who used our useSnapshots new API in a plugin,
which obviously was no one as the data result was completely broken.

Merged the NPE check patch into mine since it has to handle it too.

Spigot-Server-Patches/0232-Anti-Xray.patch

@@ -1,11 +1,11 @@
-From 24864d251b955cf8e6fcb91beb5d65dd535b2170 Mon Sep 17 00:00:00 2001
+From 804f065b55b09c5c81c3480b59ccd13b819b3938 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Thu, 21 Sep 2017 00:38:47 +0200
 Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 601eb08b..fef49cf7 100644
+index 646620d0c..4d30cdbc8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,10 @@
@@ -49,7 +49,7 @@ index 601eb08b..fef49cf7 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 new file mode 100644
-index 00000000..6833cfad
+index 000000000..6833cfad2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 @@ -0,0 +1,36 @@
@@ -91,7 +91,7 @@ index 00000000..6833cfad
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 new file mode 100644
-index 00000000..2dc0655a
+index 000000000..2dc0655a9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 @@ -0,0 +1,640 @@
@@ -737,7 +737,7 @@ index 00000000..2dc0655a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 new file mode 100644
-index 00000000..92399318
+index 000000000..92399318c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 @@ -0,0 +1,56 @@
@@ -799,7 +799,7 @@ index 00000000..92399318
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 new file mode 100644
-index 00000000..aca0b9d7
+index 000000000..aca0b9d71
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 @@ -0,0 +1,84 @@
@@ -889,7 +889,7 @@ index 00000000..aca0b9d7
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java
 new file mode 100644
-index 00000000..0bd269a0
+index 000000000..0bd269a07
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java
 @@ -0,0 +1,80 @@
@@ -975,7 +975,7 @@ index 00000000..0bd269a0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java
 new file mode 100644
-index 00000000..8ea2beb5
+index 000000000..8ea2beb59
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java
 @@ -0,0 +1,28 @@
@@ -1008,7 +1008,7 @@ index 00000000..8ea2beb5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1d056031..d1066d82 100644
+index ce76a0e5d..aecfa331d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -129,7 +129,7 @@ public class Chunk {
@@ -1039,7 +1039,7 @@ index 1d056031..d1066d82 100644
              this.initLighting();
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 14f88e91..bcce5e8b 100644
+index 14f88e91d..bcce5e8b7 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -416,7 +416,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -1052,7 +1052,7 @@ index 14f88e91..bcce5e8b 100644
              NibbleArray nibblearray = new NibbleArray(nbttagcompound1.getByteArray("Data"));
              NibbleArray nibblearray1 = nbttagcompound1.hasKeyOfType("Add", 7) ? new NibbleArray(nbttagcompound1.getByteArray("Add")) : null;
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index afdc4a77..aae227fd 100644
+index afdc4a779..aae227fdb 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -9,9 +9,15 @@ public class ChunkSection {
@@ -1092,7 +1092,7 @@ index afdc4a77..aae227fd 100644
              int xx = i & 15;
              int yy = (i >> 8) & 15;
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index fa0fd8a9..401dc7cd 100644
+index fa0fd8a9c..401dc7cdc 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -51,6 +51,7 @@ public class DataBits {
@@ -1104,7 +1104,7 @@ index fa0fd8a9..401dc7cd 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java
-index 5765b258..d522611e 100644
+index 5765b2588..d522611ec 100644
 --- a/src/main/java/net/minecraft/server/DataPalette.java
 +++ b/src/main/java/net/minecraft/server/DataPalette.java
 @@ -4,8 +4,10 @@ import javax.annotation.Nullable;
@@ -1119,7 +1119,7 @@ index 5765b258..d522611e 100644
      IBlockData a(int i);
  
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 2cb462b8..67784b4a 100644
+index 2cb462b8e..67784b4a6 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -2,22 +2,55 @@ package net.minecraft.server;
@@ -1227,7 +1227,7 @@ index 2cb462b8..67784b4a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index d0b67d8f..eeaa625d 100644
+index d0b67d8fd..eeaa625d2 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -74,6 +74,7 @@ public class EntityFallingBlock extends Entity {
@@ -1247,7 +1247,7 @@ index d0b67d8f..eeaa625d 100644
                                  if (block instanceof BlockFalling) {
                                      ((BlockFalling) block).a(this.world, blockposition, this.block, iblockdata);
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index e148901e..61fbdeb6 100644
+index e148901e5..61fbdeb6a 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -228,6 +228,7 @@ public class Explosion {
@@ -1259,7 +1259,7 @@ index e148901e..61fbdeb6 100644
                  if (flag) {
                      double d0 = (double) ((float) blockposition.getX() + this.world.random.nextFloat());
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d583cced..2eddb68d 100644
+index d583cced6..2eddb68d7 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,7 +62,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -1358,7 +1358,7 @@ index d583cced..2eddb68d 100644
          public QueuedPacket(Packet<?> packet, GenericFutureListener<? extends Future<? super Void>>... agenericfuturelistener) {
              this.a = packet;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index c1273e98..d71734df 100644
+index c1273e988..d71734df8 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -1370,7 +1370,7 @@ index c1273e98..d71734df 100644
          for (int j = 1; j < 5; ++j) {
              if ((i & -1 << j * 7) == 0) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index d16669bc..306a6b7c 100644
+index d16669bcc..306a6b7cd 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -8,6 +8,10 @@ import java.util.Iterator;
@@ -1463,7 +1463,7 @@ index d16669bc..306a6b7c 100644
                  if (flag) {
                      packetdataserializer.writeBytes(chunksection.getSkyLightArray().asBytes());
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 48a008e0..395386f2 100644
+index 48a008e0a..395386f29 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -134,6 +134,8 @@ public class PlayerChunk {
@@ -1493,7 +1493,7 @@ index 48a008e0..395386f2 100644
                  } else {
                      this.a((Packet) (new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, this.chunk)));
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index a49b5c81..5ec7f581 100644
+index a49b5c81a..5ec7f5819 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -200,6 +200,8 @@ public class PlayerInteractManager {
@@ -1506,7 +1506,7 @@ index a49b5c81..5ec7f581 100644
  
      public void a(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index 8860a012..fa0d66d6 100644
+index 8860a0129..fa0d66d63 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -47,6 +47,7 @@ public class RegistryBlockID<T> implements Registry { // Paper - Fix decompile e
@@ -1518,7 +1518,7 @@ index 8860a012..fa0d66d6 100644
          return this.a.size();
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 57bc9165..de1954a2 100644
+index 90f946e57..ea67b61b2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -35,6 +35,8 @@ import org.bukkit.generator.ChunkGenerator;
@@ -1555,7 +1555,7 @@ index 57bc9165..de1954a2 100644
  
      public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 9942f0c7..2da6edc6 100644
+index 9942f0c75..2da6edc63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -73,7 +73,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
@@ -1595,5 +1595,5 @@ index 9942f0c7..2da6edc6 100644
                          }
                      }
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0232-Avoid-NPE-during-CraftBlockEntityState-load.patch

@@ -1,42 +0,0 @@
-From 2ea6eccdaeee514a4896c592c7a3756c1e72da91 Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Mon, 18 Sep 2017 13:38:40 -0700
-Subject: [PATCH] Avoid NPE during CraftBlockEntityState load
-
-
-diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 54b719d9..3f2c5b2d 100644
---- a/src/main/java/net/minecraft/server/TileEntitySign.java
-+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
-@@ -60,7 +60,7 @@ public class TileEntitySign extends TileEntity {
-             }
- 
-             public MinecraftServer C_() {
--                return TileEntitySign.this.world.getMinecraftServer();
-+                return MinecraftServer.getServer(); // Paper - world may be null
-             }
-         };
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 266f87d7..22dcaea7 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-@@ -24,6 +24,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
- 
-         // copy tile entity data:
-         this.snapshot = this.createSnapshot(tileEntity);
-+        if(this.snapshot != null) // Paper - avoid NPE during load
-         this.load(snapshot);
-     }
- 
-@@ -35,6 +36,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
- 
-         // copy tile entity data:
-         this.snapshot = this.createSnapshot(tileEntity);
-+        if(this.snapshot != null) // Paper - avoid NPE during load
-         this.load(snapshot);
-     }
- 
--- 
-2.14.3
-

Spigot-Server-Patches/0233-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch

@@ -1,4 +1,4 @@
-From e527a04082247252ccc8d5cf4a106d211c2746e7 Mon Sep 17 00:00:00 2001
+From 1126bd5886087ed69c2860cd3e5c33823fe69b2a Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index da69bb93..7734d84e 100644
+index 26775156b..adf79de70 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -97,6 +97,13 @@
@@ -30,7 +30,7 @@ index da69bb93..7734d84e 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index b3f1aa99..85445571 100644
+index b3f1aa999..854455711 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -129,8 +129,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -47,5 +47,5 @@ index b3f1aa99..85445571 100644
  
          thread.setDaemon(true);
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0234-Handle-plugin-prefixes-using-Log4J-configuration.patch

@@ -1,4 +1,4 @@
-From 67a131ffff6c1b087b0afb1de69806244b24c0ea Mon Sep 17 00:00:00 2001
+From 512bfac63c538236abb822d031dc106c9cbb279f Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index 7734d84e..28976dae 100644
+index adf79de70..1639621d7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -94,7 +94,7 @@
@@ -28,7 +28,7 @@ index 7734d84e..28976dae 100644
  
          <!-- Paper - Add additional Log4J dependencies -->
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9ce3e136..cc1f3ac9 100644
+index 9ce3e1365..cc1f3ac96 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -282,7 +282,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index 9ce3e136..cc1f3ac9 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f..9f833437 100644
+index 08b6bb7f9..9f8334376 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
@@ -70,5 +70,5 @@ index 08b6bb7f..9f833437 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0235-Include-Log4J2-SLF4J-implementation.patch

@@ -1,11 +1,11 @@
-From b810abd1c308634b722548b03cd532dba405ead6 Mon Sep 17 00:00:00 2001
+From be659b782e26a5a9f87641cd46ba7698776fcaca Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index 28976dae..ffa9f5a9 100644
+index 1639621d7..bf04f6d12 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -98,6 +98,12 @@
@@ -22,5 +22,5 @@ index 28976dae..ffa9f5a9 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0236-Disable-logger-prefix-for-various-plugins-bypassing-.patch

@@ -1,4 +1,4 @@
-From 432385ee12a9a154c4924b5581b287a8f37f21f4 Mon Sep 17 00:00:00 2001
+From 82ffd297051a129e48492ee39ebf293bf3b64c49 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f833437..6711e6df 100644
+index 9f8334376..6711e6dff 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
@@ -35,5 +35,5 @@ index 9f833437..6711e6df 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0237-Add-PlayerJumpEvent.patch

@@ -1,11 +1,11 @@
-From 6aa7c71a2150705b12dab5e58add78b04d0f98a1 Mon Sep 17 00:00:00 2001
+From 0a884dd3df347b2e3e44c1e19e5f6474f108e8c9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index deb0f4a9..579996d1 100644
+index deb0f4a9c..579996d1e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1399,6 +1399,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index deb0f4a9..579996d1 100644
          super.cu();
          this.b(StatisticList.w);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3104fc0e..aa57ff8e 100644
+index 3104fc0ea..aa57ff8ed 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -65,5 +65,5 @@ index 3104fc0e..aa57ff8e 100644
  
                              this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0238-handle-PacketPlayInKeepAlive-async.patch

@@ -1,4 +1,4 @@
-From 041fa5d77011eb2a6a790046228fa84d3afbaece Mon Sep 17 00:00:00 2001
+From c969945f60e231630312e13ec01f36b916d59f68 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aa57ff8e..869a2b40 100644
+index aa57ff8ed..869a2b402 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2230,14 +2230,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -42,5 +42,5 @@ index aa57ff8e..869a2b40 100644
  
      }
 -- 
-2.14.3
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 5cef17ac96b6148501f5b69324e5dbc002f4cb48 Mon Sep 17 00:00:00 2001
+From af394416c12e2f60579f3f08fd6d9629c0c299a1 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 00000000..5caca643
+index 000000000..5caca6439
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 00000000..5caca643
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 309ab18d..c583ab7d 100644
+index 309ab18df..c583ab7d9 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 309ab18d..c583ab7d 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 2eddb68d..b93a26e8 100644
+index 2eddb68d7..b93a26e8f 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -75,6 +75,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 2eddb68d..b93a26e8 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index aececa39..1d4ba3b3 100644
+index aececa39d..1d4ba3b3d 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index aececa39..1d4ba3b3 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1269a02a..428b208a 100644
+index 1269a02aa..428b208ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -136,6 +136,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -136,5 +136,5 @@ index 1269a02a..428b208a 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0240-revert-serverside-behavior-of-keepalives.patch

@@ -1,4 +1,4 @@
-From 6565b3234a5ed4860241095a9b552f29833f130f Mon Sep 17 00:00:00 2001
+From dda581e2f95d1e878c6dfe7468527a7df11e9adb Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 869a2b40..284db9b9 100644
+index 869a2b402..284db9b9e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -68,7 +68,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -74,5 +74,5 @@ index 869a2b40..284db9b9 100644
          this.minecraftServer.methodProfiler.b();
          // CraftBukkit start
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0241-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch

@@ -1,4 +1,4 @@
-From 965e44334174a233db11efe7f368f8db2c97c7e7 Mon Sep 17 00:00:00 2001
+From 72fb32f1476e6f822e14c48f56f6c4f4713172af Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@@ -13,7 +13,7 @@ ObjectOpenHashSet never uses compareTo(), so the inconsistencies of NextTickList
 Fixes https://github.com/PaperMC/Paper/issues/588
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
-index 80a5c29f..cd864c40 100644
+index 80a5c29f3..cd864c404 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/HashTreeSet.java
 @@ -8,7 +8,7 @@ import java.util.TreeSet;
@@ -26,5 +26,5 @@ index 80a5c29f..cd864c40 100644
  
      public HashTreeSet() {
 -- 
-2.14.3
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 96f7c1bdb10080dfeb611fbff817d8fb39bffb4c Mon Sep 17 00:00:00 2001
+From db87b402a8141a989c8998c9704eb250f2a3a43e Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 579996d1..34723705 100644
+index 579996d1e..347237055 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -939,6 +939,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 579996d1..34723705 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 592e5b3b..d45cbf2f 100644
+index ea67b61b2..29dffc3ac 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1061,6 +1061,12 @@ public abstract class World implements IBlockAccess {
@@ -89,5 +89,5 @@ index 592e5b3b..d45cbf2f 100644
          for (int i = 0; i < this.u.size(); ++i) {
              ((IWorldAccess) this.u.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1);
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0243-Option-for-maximum-exp-value-when-merging-orbs.patch

@@ -1,11 +1,11 @@
-From e8c4bfe810e61f6c62e6e36cbd3920e46b11b998 Mon Sep 17 00:00:00 2001
+From 23b635752379ea7023f015f78db839db97bd56e0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fef49cf7..57cf49a7 100644
+index 4d30cdbc8..535a8d3ed 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -457,4 +457,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index fef49cf7..57cf49a7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8a249af0..b193e051 100644
+index 29dffc3ac..2c69ae748 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1143,16 +1143,30 @@ public abstract class World implements IBlockAccess {
@@ -56,5 +56,5 @@ index 8a249af0..b193e051 100644
          } // Spigot end
  
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0244-Add-PlayerArmorChangeEvent.patch

@@ -1,11 +1,11 @@
-From fa64634c12186e182b6df1852967948db0d21c32 Mon Sep 17 00:00:00 2001
+From 1e2b4a3ca945ce4688ed7e13df4c305ba810f49e Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index aa4c23a1..d1b3b20f 100644
+index 44335fd2d..9adcabd4f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index aa4c23a1..d1b3b20f 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index cdf3a3ba..be5d0bf8 100644
+index cdf3a3ba4..be5d0bf89 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
@@ -42,5 +42,5 @@ index cdf3a3ba..be5d0bf8 100644
          return this.g;
      }
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0245-Improve-Structures-Checking.patch

@@ -1,4 +1,4 @@
-From 2de082f53860d4623c135b9c1f8daf6cb161a32b Mon Sep 17 00:00:00 2001
+From 5599edfac6325734591209213d3d37c2841aa1e9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Nov 2017 17:57:39 -0500
 Subject: [PATCH] Improve Structures Checking
@@ -14,7 +14,7 @@ that has been around for a whilewith lots of structures due to ineffeciencies
 in how MC stores structures (even unloaded chunks has structured data loaded)
 
 diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java
-index db419cd9..d9329bd4 100644
+index db419cd99..d9329bd42 100644
 --- a/src/main/java/net/minecraft/server/StructureBoundingBox.java
 +++ b/src/main/java/net/minecraft/server/StructureBoundingBox.java
 @@ -4,12 +4,14 @@ import com.google.common.base.MoreObjects;
@@ -47,7 +47,7 @@ index db419cd9..d9329bd4 100644
          return baseblockposition.getX() >= this.a && baseblockposition.getX() <= this.d && baseblockposition.getZ() >= this.c && baseblockposition.getZ() <= this.f && baseblockposition.getY() >= this.b && baseblockposition.getY() <= this.e;
      }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index e8263baa..f4dfba8f 100644
+index e8263baa4..f4dfba8f3 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@@ -157,7 +157,7 @@ index e8263baa..f4dfba8f 100644
          this.a.a(structurestart.a(i, j), i, j);
          this.a.c();
 diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index 93903bc6..fcc13f81 100644
+index 93903bc67..fcc13f811 100644
 --- a/src/main/java/net/minecraft/server/StructurePiece.java
 +++ b/src/main/java/net/minecraft/server/StructurePiece.java
 @@ -53,6 +53,7 @@ public abstract class StructurePiece {
@@ -169,7 +169,7 @@ index 93903bc6..fcc13f81 100644
          return this.l;
      }
 diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
-index b6abc74e..f9bb953d 100644
+index b6abc74e0..f9bb953d0 100644
 --- a/src/main/java/net/minecraft/server/StructureStart.java
 +++ b/src/main/java/net/minecraft/server/StructureStart.java
 @@ -19,10 +19,12 @@ public abstract class StructureStart {
@@ -195,5 +195,5 @@ index b6abc74e..f9bb953d 100644
      }
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0246-Prevent-logins-from-being-processed-when-the-player-.patch

@@ -1,4 +1,4 @@
-From 138b8d9ad24d25d198ec0904bc556ebdea9cdd36 Mon Sep 17 00:00:00 2001
+From 1c8f764dc856a224c003f7cba4feb712e1bde8bf Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 75df9283..eaac25dc 100644
+index 75df92836..eaac25dc3 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -60,7 +60,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -23,5 +23,5 @@ index 75df9283..eaac25dc 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0247-use-CB-BlockState-implementations-for-captured-block.patch

@@ -1,4 +1,4 @@
-From d4d62f09d576402a7920cecb653028ad76590f42 Mon Sep 17 00:00:00 2001
+From 7b58a5fe06de0cc55536a8d63385f8c589eacaa6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0193364d..e4502551 100644
+index 2c69ae748..39b90fb4c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -393,7 +393,8 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index 0193364d..e4502551 100644
              }
              // CraftBukkit end
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0248-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -1,4 +1,4 @@
-From 8cd8c32f4d0e94e0c1d4591c3cbb28329d54e1dd Mon Sep 17 00:00:00 2001
+From 1b84dbaa916aab00f95f098c28769b1127e39b2f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -8,8 +8,12 @@ on the real tile entity.
 
 This is useful for where performance is needed
 
+also Avoid NPE during CraftBlockEntityState load if could not get TE
+
+If Tile Entity was null, correct Sign to return empty lines instead of null
+
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 537e4b15..8e2d55a7 100644
+index 537e4b155..8e2d55a73 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -264,7 +264,12 @@ public abstract class TileEntity {
@@ -34,8 +38,21 @@ index 537e4b15..8e2d55a7 100644
          if (state instanceof InventoryHolder) return (InventoryHolder) state;
          return null;
      }
+diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
+index 54b719d91..3f2c5b2d5 100644
+--- a/src/main/java/net/minecraft/server/TileEntitySign.java
++++ b/src/main/java/net/minecraft/server/TileEntitySign.java
+@@ -60,7 +60,7 @@ public class TileEntitySign extends TileEntity {
+             }
+ 
+             public MinecraftServer C_() {
+-                return TileEntitySign.this.world.getMinecraftServer();
++                return MinecraftServer.getServer(); // Paper - world may be null
+             }
+         };
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 46670c34..a9d3f12b 100644
+index 46670c346..a9d3f12bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -260,7 +260,22 @@ public class CraftBlock implements Block {
@@ -62,24 +79,27 @@ index 46670c34..a9d3f12b 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 22dcaea7..3b5a90c3 100644
+index 266f87d7f..fe112812d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-@@ -22,17 +22,34 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
+@@ -22,20 +22,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
          CraftWorld world = (CraftWorld) this.getWorld();
          this.tileEntity = tileEntityClass.cast(world.getTileEntityAt(this.getX(), this.getY(), this.getZ()));
  
 +        // Paper start
 +        this.snapshotDisabled = DISABLE_SNAPSHOT;
 +        if (DISABLE_SNAPSHOT) {
-+            this.snapshot = tileEntity;
-+            return;
++            this.snapshot = this.tileEntity;
++        } else {
++            this.snapshot = this.createSnapshot(this.tileEntity);
++        }
+         // copy tile entity data:
+-        this.snapshot = this.createSnapshot(tileEntity);
+-        this.load(snapshot);
++        if(this.snapshot != null) {
++            this.load(this.snapshot);
 +        }
 +        // Paper end
-         // copy tile entity data:
-         this.snapshot = this.createSnapshot(tileEntity);
-         if(this.snapshot != null) // Paper - avoid NPE during load
-         this.load(snapshot);
      }
  
 +    public final boolean snapshotDisabled; // Paper
@@ -90,16 +110,41 @@ index 22dcaea7..3b5a90c3 100644
  
          this.tileEntityClass = (Class<T>) tileEntity.getClass();
          this.tileEntity = tileEntity;
+-
 +        // Paper start
 +        this.snapshotDisabled = DISABLE_SNAPSHOT;
 +        if (DISABLE_SNAPSHOT) {
-+            this.snapshot = tileEntity;
-+            return;
++            this.snapshot = this.tileEntity;
++        } else {
++            this.snapshot = this.createSnapshot(this.tileEntity);
++        }
+         // copy tile entity data:
+-        this.snapshot = this.createSnapshot(tileEntity);
+-        this.load(snapshot);
++        if(this.snapshot != null) {
++            this.load(this.snapshot);
 +        }
 +        // Paper end
+     }
  
-         // copy tile entity data:
-         this.snapshot = this.createSnapshot(tileEntity);
+     private T createSnapshot(T tileEntity) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+index 7a8d44529..97b4e6910 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+@@ -14,10 +14,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
+ 
+     public CraftSign(final Block block) {
+         super(block, TileEntitySign.class);
++        if (lines == null) { lines = new String[]{"", "", "", ""}; } // Paper
+     }
+ 
+     public CraftSign(final Material material, final TileEntitySign te) {
+         super(material, te);
++        if (lines == null) { lines = new String[]{"", "", "", ""}; } // Paper
+     }
+ 
+     @Override
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0249-AsyncTabCompleteEvent.patch

@@ -1,4 +1,4 @@
-From ef21a8c5f4fb0e822edc88e1bdbfa0df78df4b69 Mon Sep 17 00:00:00 2001
+From b40f20ff1ac10b7ef1098e8c3f3fad23d6e73887 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 284db9b9..e6d0c636 100644
+index 284db9b9e..e6d0c6366 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2276,24 +2276,51 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -80,7 +80,7 @@ index 284db9b9..e6d0c636 100644
  
      public void a(PacketPlayInSettings packetplayinsettings) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2dd7ed96..e86c1675 100644
+index 2dd7ed96a..e86c16755 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1643,8 +1643,8 @@ public final class CraftServer implements Server {
@@ -95,7 +95,7 @@ index 2dd7ed96..e86c1675 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 1e3aae3b..95d13c14 100644
+index 1e3aae3b8..95d13c146 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
@@ -139,5 +139,5 @@ index 1e3aae3b..95d13c14 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0250-Avoid-NPE-in-PathfinderGoalTempt.patch

@@ -1,11 +1,11 @@
-From a811f2e4313c6205db1b899c4c23abb6e1fefef9 Mon Sep 17 00:00:00 2001
+From 32a109d078d259d8e4c16bb59ed385cdb0a86b83 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index 188825d1..8004f3a3 100644
+index 188825d19..8004f3a3f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -54,7 +54,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -18,5 +18,5 @@ index 188825d1..8004f3a3 100644
          }
      }
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0251-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch

@@ -1,4 +1,4 @@
-From 8c155ab653d16ddc8cf6850af419983467abf449 Mon Sep 17 00:00:00 2001
+From 3189e3af74a86585787bd2adbfa1315620bbd417 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 18 Dec 2017 07:26:56 +0000
 Subject: [PATCH] Don't blindly send unlit chunks when lighting updates are
@@ -44,5 +44,5 @@ index aecfa331d..7cd537a59 100644
      }
  
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0252-PlayerPickupExperienceEvent.patch

@@ -1,4 +1,4 @@
-From be768786c2c453da077ab12b03d21bd1517c0b7b Mon Sep 17 00:00:00 2001
+From b9462b799af5cf7d7fff939ab35e4d1ef8291b06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index d567ad4a..ff5cc74b 100644
+index d567ad4a5..ff5cc74ba 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -206,7 +206,7 @@ public class EntityExperienceOrb extends Entity {
@@ -19,5 +19,5 @@ index d567ad4a..ff5cc74b 100644
                  entityhuman.receive(this, 1);
                  ItemStack itemstack = EnchantmentManager.b(Enchantments.C, (EntityLiving) entityhuman);
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0253-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From 1f708df86d0848f78966d930eda728832f4f3b2b Mon Sep 17 00:00:00 2001
+From 8bba43fbcd5555066af8c96d92bc5d528590b0bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e4502551..9f5388ed 100644
+index 39b90fb4c..c0816b9f8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1153,7 +1153,7 @@ public abstract class World implements IBlockAccess {
@@ -21,5 +21,5 @@ index e4502551..9f5388ed 100644
                              // Paper start
                              if (!mergeUnconditionally && xp.value > maxValue) {
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0254-Ability-to-apply-mending-to-XP-API.patch

@@ -1,4 +1,4 @@
-From a8a128697eaaacb25e8e8fa9ac38f1dd0c2a892d Mon Sep 17 00:00:00 2001
+From 4c489e89e39fcb4fec045b5a7a67d5cce33aa7c1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API

Spigot-Server-Patches/0255-Configurable-Chunks-Sends-per-Tick-setting.patch

@@ -1,4 +1,4 @@
-From b6556677e0c93e803b8d3930269363208bb0d035 Mon Sep 17 00:00:00 2001
+From b5d1b1c0569564884364040d64875b020c464c62 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -8,7 +8,7 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 57cf49a7..d5babe47 100644
+index 535a8d3ed..e3ff78180 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -463,4 +463,13 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 57cf49a7..d5babe47 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4af55732..6ee9f6cf 100644
+index 4af557321..6ee9f6cfb 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -198,7 +198,7 @@ public class PlayerChunkMap {
@@ -39,5 +39,5 @@ index 4af55732..6ee9f6cf 100644
              Iterator iterator2 = this.g.iterator();
  
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0256-Configurable-Max-Chunk-Gens-per-Tick.patch

@@ -1,4 +1,4 @@
-From f5702893dccc7fa893135bf36c108bbc66fa8219 Mon Sep 17 00:00:00 2001
+From 8763a29d704f1a5dfc16a419e5f4bda7da76b587 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -13,7 +13,7 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d5babe47..99bc456e 100644
+index e3ff78180..0ddf826f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -472,4 +472,16 @@ public class PaperWorldConfig {
@@ -34,7 +34,7 @@ index d5babe47..99bc456e 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 395386f2..baf72404 100644
+index 395386f29..baf72404e 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -27,6 +27,7 @@ public class PlayerChunk {
@@ -54,7 +54,7 @@ index 395386f2..baf72404 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 6ee9f6cf..99652ae3 100644
+index 6ee9f6cfb..99652ae3e 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -166,6 +166,7 @@ public class PlayerChunkMap {
@@ -78,7 +78,7 @@ index 6ee9f6cf..99652ae3 100644
                      if (playerchunk1.a(flag)) {
                          iterator1.remove();
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 9aaca21a..f50d55c8 100644
+index 9aaca21a7..f50d55c8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -35,4 +35,10 @@ public class ChunkIOExecutor {
@@ -93,7 +93,7 @@ index 9aaca21a..f50d55c8 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
-index 193c3621..cf1258c5 100644
+index 193c3621c..cf1258c55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 @@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
@@ -108,5 +108,5 @@ index 193c3621..cf1258c5 100644
 +    // Paper end
  }
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0257-Make-max-squid-spawn-height-configurable.patch

@@ -1,4 +1,4 @@
-From 036e5362efcfdde64d6a0bb3ce0e359573c9358c Mon Sep 17 00:00:00 2001
+From 79f022faf9edc84a85588c097dc90ae715216738 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 99bc456e..f6a8fcae 100644
+index 0ddf826f9..9fd76dcc9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -484,4 +484,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 99bc456e..f6a8fcae 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 0ce16be6..58a90283 100644
+index 0ce16be65..58a902831 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -141,7 +141,9 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -36,5 +36,5 @@ index 0ce16be6..58a90283 100644
  
      public void b(float f, float f1, float f2) {
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0258-PreCreatureSpawnEvent.patch

@@ -1,4 +1,4 @@
-From a459698038d1d6211dc49b2a0a1eb7749d3b22d2 Mon Sep 17 00:00:00 2001
+From e39a40897af178906e93bf6415936e75dcdcb137 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -85,5 +85,5 @@ index 2cd063829..e217d3340 100644
  
                                                          try {
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0259-PlayerNaturallySpawnCreaturesEvent.patch

@@ -1,4 +1,4 @@
-From 7006795db9ba34d371a26c6a02a83600d1f2b117 Mon Sep 17 00:00:00 2001
+From 232a16a575ebefa275a56c0731a58df323473bcc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index e217d334..46faa062 100644
+index e217d3340..46faa062d 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -72,6 +72,15 @@ public final class SpawnerCreature {
@@ -29,5 +29,5 @@ index e217d334..46faa062 100644
                      for (int i1 = -b0; i1 <= b0; ++i1) {
                          for (k = -b0; k <= b0; ++k) {
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0260-Add-SkullMeta.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From e9dc047d681a808472cbf58f3ec4128367d8e8c6 Mon Sep 17 00:00:00 2001
+From 3a3a658f248587d4545b22283f94af64b7d7d361 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add SkullMeta.setPlayerProfile API
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index e2ea49cd..dbc08335 100644
+index 862b30286..1ac549e5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -49,5 +49,5 @@ index e2ea49cd..dbc08335 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0261-Fill-Profile-Property-Events.patch

@@ -1,4 +1,4 @@
-From 778f0a583f0d95f233434b8eef9e7136915455a9 Mon Sep 17 00:00:00 2001
+From e984aa8d9690e7842f69614d9f0f3b37d917279f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -38,5 +38,5 @@ index 4b2a67423..f83aa5ef0 100644
  
      @Override
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0262-PlayerAdvancementCriterionGrantEvent.patch

@@ -1,11 +1,11 @@
-From d6e9b9c825d7abaea63c248016e31e2ce9c41766 Mon Sep 17 00:00:00 2001
+From 606a42a3c07a7e49d68933c01f3681b49667d571 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 6896b709..8913e274 100644
+index 6896b7095..8913e2744 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -196,6 +196,12 @@ public class AdvancementDataPlayer {
@@ -22,5 +22,5 @@ index 6896b709..8913e274 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0263-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch

@@ -1,4 +1,4 @@
-From 1e2a62261aadcd7ed15ca4cd0af79cf14eb7058f Mon Sep 17 00:00:00 2001
+From 5430376a868bfe7d5e6b26745efc104ae8c477f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 24 Jan 2018 20:06:39 -0500
 Subject: [PATCH] MC-99321 - Dont check for blocked double chest for hoppers
@@ -11,7 +11,7 @@ This removes the necessity to disable the cat on chest behavior to improve perfo
 now performance will be improved even if you have cat chest detection on.
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 90267a1f..91d3308c 100644
+index 90267a1fb..91d3308c1 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -348,7 +348,7 @@ public class BlockChest extends BlockTileEntity {
@@ -24,5 +24,5 @@ index 90267a1f..91d3308c 100644
                          }
  
 -- 
-2.14.3
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 202978d1bc267893f69124193ea9591a552d83cd Mon Sep 17 00:00:00 2001
+From 0c60288376b74c282559d93fafc0ec93f14e54c7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index c2f26577..851960af 100644
+index c2f26577c..851960afb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -96,6 +96,8 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index c2f26577..851960af 100644
          case CHEST:
          case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index cdf16e15..aa99254f 100644
+index cdf16e15a..aa99254ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -307,6 +307,8 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index cdf16e15..aa99254f 100644
              case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 new file mode 100644
-index 00000000..dc372f6d
+index 000000000..dc372f6db
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +1,305 @@
@@ -350,7 +350,7 @@ index 00000000..dc372f6d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 0cdc8007..2ab4a1cf 100644
+index 0cdc8007a..2ab4a1cf4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -129,6 +129,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -379,7 +379,7 @@ index 0cdc8007..2ab4a1cf 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 1f537d58..a29731f1 100644
+index 1f537d584..a29731f1d 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -5,6 +5,8 @@ import static org.hamcrest.Matchers.*;
@@ -407,5 +407,5 @@ index 1f537d58..a29731f1 100644
          );
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0265-Extend-Player-Interact-cancellation-to-GUIs.patch

@@ -1,4 +1,4 @@
-From 556a730d0e2356f74df220a1f01d13f680085781 Mon Sep 17 00:00:00 2001
+From c560723f16f4031e744c72e218e20b0153c35e3f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation to GUIs
@@ -7,7 +7,7 @@ GUIs are opened on the client, meaning that the server cannot block them from op
 However, it is possible to close these GUIs from the server.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 5ec7f581..b1cdb215 100644
+index 5ec7f5819..b1cdb2154 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -468,6 +468,12 @@ public class PlayerInteractManager {
@@ -24,5 +24,5 @@ index 5ec7f581..b1cdb215 100644
                  ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867
                  enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0266-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From 50648b257e2c9bedc9c3db5286f32d261bc93b8e Mon Sep 17 00:00:00 2001
+From 49583f851be976702eb3b66278563d66e3285b24 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f6a8fcae..5e930d79 100644
+index 9fd76dcc9..363e03b65 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -489,4 +489,12 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index f6a8fcae..5e930d79 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fcf6bac0..3092913f 100644
+index fcf6bac08..3092913f5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -876,6 +876,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -40,7 +40,7 @@ index fcf6bac0..3092913f 100644
                  this.methodProfiler.a(() -> {
                      return worldserver.getWorldData().getName();
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8e2d55a7..fe2df18d 100644
+index 8e2d55a73..fe2df18df 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -34,6 +34,7 @@ public abstract class TileEntity {
@@ -60,7 +60,7 @@ index 8e2d55a7..fe2df18d 100644
  
              this.g = iblockdata.getBlock().toLegacyData(iblockdata);
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index e9315f2d..5198a590 100644
+index e9315f2d5..5198a590a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -196,6 +196,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -280,5 +280,5 @@ index e9315f2d..5198a590 100644
                  flag = true;
              } else if (a(itemstack1, itemstack)) {
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0267-Tameable-getOwnerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From c40913d4c0e5ddb77f6d83bb3831323bb1d7c846 Mon Sep 17 00:00:00 2001
+From a5522b3c31b17b58d70663414748c0932f5f23ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index e56bef33..cc9d432e 100644
+index e56bef334..cc9d432e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -83,6 +83,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index e56bef33..cc9d432e 100644
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index eaaebeab..2e959321 100644
+index eaaebeab8..2e959321b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -18,6 +18,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
@@ -35,5 +35,5 @@ index eaaebeab..2e959321 100644
          try {
              return getHandle().getOwnerUUID();
 -- 
-2.14.3
+2.18.0
 

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

@@ -1,11 +1,11 @@
-From 5e4dc61000da32545bc0bfcd3b32165f8af8314c Mon Sep 17 00:00:00 2001
+From 147b516910174ad1413b2052ea2c76614636af89 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 61cc1d4e..038f874b 100644
+index 363e03b65..ef1fa8cf6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -232,6 +232,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 61cc1d4e..038f874b 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 34723705..4b82e43a 100644
+index 347237055..4b82e43a8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -978,7 +978,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,5 +34,5 @@ index 34723705..4b82e43a 100644
                      if (flag2) {
                          f *= 1.5F;
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0269-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch

@@ -1,4 +1,4 @@
-From 28121602c16d0b23af519891ed0d404a21f93aa5 Mon Sep 17 00:00:00 2001
+From 2bef360d1b3d8f27bee1bd597800e2f6afc0b43d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index cd7de2b5..37b494b7 100644
+index cd7de2b53..37b494b78 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -27,5 +27,5 @@ index cd7de2b5..37b494b7 100644
      }
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0270-Prevent-Frosted-Ice-from-loading-holding-chunks.patch

@@ -1,11 +1,11 @@
-From 1fd52dc633eb87295f7c5f9d60fb8434ac1ef08b Mon Sep 17 00:00:00 2001
+From f85b94a3c719ead513133dfa1f9d26e8f167a979 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index a8dbbf20..87f40bfc 100644
+index a8dbbf20a..87f40bfcf 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -50,7 +50,9 @@ public class BlockIceFrost extends BlockIce {
@@ -30,5 +30,5 @@ index a8dbbf20..87f40bfc 100644
                      if (iblockdata1.getBlock() == this) {
                          this.a(world, blockposition1, iblockdata1, random, false);
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0271-Disable-Explicit-Network-Manager-Flushing.patch

@@ -1,4 +1,4 @@
-From 3413ad534b54b0203e71ba0293a5a51ada2b097d Mon Sep 17 00:00:00 2001
+From f3ae87325bc373a347097bc2713716ea63926076 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index b93a26e8..3d32e005 100644
+index b93a26e8f..3d32e0056 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -78,6 +78,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -33,5 +33,5 @@ index b93a26e8..3d32e005 100644
  
      }
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0272-Implement-extended-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From 6499c96e7d9c95cf8aa2181bb0558d45aa7f69b0 Mon Sep 17 00:00:00 2001
+From 396d97163d2b62c0e04684cc4f00bc928c3403b8 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -264,5 +264,5 @@ index cc1f3ac96..4f9fd4bc6 100644
      }
  
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0273-Improved-Async-Task-Scheduler.patch

@@ -1,4 +1,4 @@
-From 7391e13c1343b12093e395a98164b7b0859465fb Mon Sep 17 00:00:00 2001
+From 4b7fecc2832189ba7a4dd7efbe707ad05eaee78b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@@ -387,5 +387,5 @@ index a2fadaf82..223afc7ed 100644
  
      private boolean isReady(final int currentTick) {
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0274-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch

@@ -1,4 +1,4 @@
-From 12cb0549504a718334e7f0badf1aa6d1984e8d4a Mon Sep 17 00:00:00 2001
+From 45594184b96f90922bca7d7239d69d4816292892 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index eaac25dc..2842956b 100644
+index eaac25dc3..2842956bf 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
@@ -44,5 +44,5 @@ index eaac25dc..2842956b 100644
                              if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                  final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.14.3
+2.18.0
 

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

@@ -1,11 +1,11 @@
-From 1926f7c5b49a00135c820f7352ec38e400c9603b Mon Sep 17 00:00:00 2001
+From c79dab589c018cfc9b63461e23e4ccc707d0c0e8 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
 
 
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index f4972979..42e4b2d0 100644
+index f49729796..42e4b2d01 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -3,10 +3,17 @@ package net.minecraft.server;
@@ -111,5 +111,5 @@ index f4972979..42e4b2d0 100644
      }
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0276-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 18b5a2e1abbb2f763bdae6656a2f6d7aea11f28b Mon Sep 17 00:00:00 2001
+From 33a45aa43f76853f353a03b269a95c684da281a9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4b82e43a..35fde8b2 100644
+index 4b82e43a8..35fde8b23 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -59,7 +59,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 4b82e43a..35fde8b2 100644
      private final ItemCooldown bW;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 2842956b..8aeded42 100644
+index 2842956bf..8aeded425 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -41,7 +41,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -48,7 +48,7 @@ index 2842956b..8aeded42 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 21631c58..1e73a330 100644
+index 21631c588..1e73a3308 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -118,5 +118,5 @@ index 21631c58..1e73a330 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0277-Configurable-Unrestricted-Signs.patch

@@ -1,4 +1,4 @@
-From b0972764eddda27e7f6ff9e0f55f2fecda2bb046 Mon Sep 17 00:00:00 2001
+From 469e635779a9a40bbcc3403c30d3cc828af7bf27 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 19:57:10 -0400
 Subject: [PATCH] Configurable Unrestricted Signs
@@ -18,7 +18,7 @@ Creative servers should absolutely never enable this.
 Non creative servers, enable at own risk!!!
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 3f2c5b2d..67bd3bcb 100644
+index 3f2c5b2d5..67bd3bcbe 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -38,7 +38,7 @@ public class TileEntitySign extends TileEntity {
@@ -46,7 +46,7 @@ index 3f2c5b2d..67bd3bcb 100644
 +    public interface ISignCommandListener extends ICommandListener {} // Paper
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e86c1675..6095948e 100644
+index e86c16755..6095948e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -175,6 +175,7 @@ public final class CraftServer implements Server {
@@ -79,5 +79,5 @@ index e86c1675..6095948e 100644
      }
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0278-Fix-Dragon-Server-Crashes.patch

@@ -1,4 +1,4 @@
-From bd0e9f4b5282b25360b81d1949405051aca3d6aa Mon Sep 17 00:00:00 2001
+From aeccf3dbd64f77d7266d3015f0dd0d7954786fdd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index 054a7ef6..deee5c4c 100644
+index 054a7ef6c..deee5c4cc 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -51,7 +51,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -20,5 +20,5 @@ index 054a7ef6..deee5c4c 100644
                  blockposition_mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
              }
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0279-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 9b72cfcb95a129eab484671c09991b25381bcc85 Mon Sep 17 00:00:00 2001
+From 4d634e80f859fa10b307b63ce84d7903ec8fed59 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6095948e..80702f6f 100644
+index 6095948e8..80702f6f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1346,6 +1346,26 @@ public final class CraftServer implements Server {
@@ -40,5 +40,5 @@ index 6095948e..80702f6f 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0280-Make-player-data-saving-configurable.patch

@@ -1,11 +1,11 @@
-From 68cdd788988d3cce8fe37f10886f707df1a2ee22 Mon Sep 17 00:00:00 2001
+From d9a13f8dca9c5a0406fa74b41038bfb5fb6339b8 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ec89ecfc..b602bbf1 100644
+index ec89ecfca..b602bbf12 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -282,4 +282,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index ec89ecfc..b602bbf1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index eba1228f..4e33cc2f 100644
+index eba1228fd..4e33cc2f2 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -142,6 +142,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@@ -35,5 +35,5 @@ index eba1228f..4e33cc2f 100644
              NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
              File file = new File(this.playerDir, entityhuman.bn() + ".dat.tmp");
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0281-Make-the-legacy-ping-handler-more-reliable.patch

@@ -1,4 +1,4 @@
-From e5e2cd4ea0e1734564f236f55af9b40950da47db Mon Sep 17 00:00:00 2001
+From 414e39cc2aa1d2ec4cd145c42fc78a446cc6d984 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make the legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 4c1a0181..f084a653 100644
+index 4c1a0181a..f084a653a 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
@@ -153,5 +153,5 @@ index 4c1a0181..f084a653 100644
          channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
      }
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0282-Call-PaperServerListPingEvent-for-legacy-pings.patch

@@ -1,4 +1,4 @@
-From 0f653c3c6e5b1cc21be1d517c236236820a4d549 Mon Sep 17 00:00:00 2001
+From 4410aed47a8119f458eb15da78b2fb644881cd17 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 00000000..74c012fd
+index 000000000..74c012fd4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 00000000..74c012fd
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index f084a653..39d19e91 100644
+index f084a653a..39d19e91b 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -9,6 +9,7 @@ import java.net.InetSocketAddress;
@@ -153,5 +153,5 @@ index f084a653..39d19e91 100644
      }
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0283-Flag-to-disable-the-channel-limit.patch

@@ -1,4 +1,4 @@
-From 2edffdfd3deece0bf7c81be7d36754bc6483d022 Mon Sep 17 00:00:00 2001
+From 714b94695d27c70d0c293d3e4ad5d623f2924e44 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1e73a330..fd47065c 100644
+index 1e73a3308..fd47065c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -93,6 +93,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,5 +30,5 @@ index 1e73a330..fd47065c 100644
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
          }
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0284-MC-124833.patch

@@ -1,4 +1,4 @@
-From 9fecf2319add5a518288ba69ae6fe0167e10efcc Mon Sep 17 00:00:00 2001
+From 36e9ce39e1d8b400429841d897708bb00498127f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 4 Apr 2018 21:00:43 -0400
 Subject: [PATCH] MC-124833
@@ -24,5 +24,5 @@ index 8b806c303..f0d6d6b85 100644
      }
  
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0285-Add-method-to-open-already-placed-sign.patch

@@ -1,4 +1,4 @@
-From 7c3df4fa912a9bb2192a0d96cefc191085afd673 Mon Sep 17 00:00:00 2001
+From 841320b5032e39463ad433686abf91824b33aa13 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
@@ -27,5 +27,5 @@ index a0128426f..d85b5defc 100644
 +    // Paper end
  }
 -- 
-2.16.3
+2.18.0
 

Spigot-Server-Patches/0286-Load-version-history-at-server-start.patch

@@ -1,4 +1,4 @@
-From 74334c78f85601ec2518956d0a4cb118d923f93f Mon Sep 17 00:00:00 2001
+From 746d4e30806073d5988e5227c8c3e4baf8e5824f Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start
@@ -17,5 +17,5 @@ index 854455711..39a3d46ff 100644
  
              DedicatedServer.LOGGER.info("Generating keypair");
 -- 
-2.14.3
+2.18.0
 

Spigot-Server-Patches/0287-Handle-bad-chunks-more-gracefully.patch

@@ -1,4 +1,4 @@
-From 1b3610b5199b739775d7758545642559eed33a88 Mon Sep 17 00:00:00 2001
+From b109748c82366091cedff693b08fc989943af53f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 17 Apr 2018 21:26:31 -0400
 Subject: [PATCH] Handle bad chunks more gracefully
@@ -49,5 +49,5 @@ index ef9529add..cdf3b614c 100644
      }
  
 -- 
-2.14.3
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 02d1a77b8eb9fbaf23afe0f5b09bca76497f1369 Mon Sep 17 00:00:00 2001
+From 5d096e89939df84db8b2a58b436a538d082fb52a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9a5939a7..2bdedd83 100644
+index ef1fa8cf6..5a2fbf7c7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -502,4 +502,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 9a5939a7..2bdedd83 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 35fde8b2..0b51903e 100644
+index 35fde8b23..0b51903e2 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1030,7 +1030,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,5 +37,5 @@ index 35fde8b2..0b51903e 100644
  
                          if (flag3) {
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0289-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch

@@ -1,4 +1,4 @@
-From 71c7eb43fbd717cf08670a91d16a87530ac8f66d Mon Sep 17 00:00:00 2001
+From ae8090cca9c376e49986204021750f75d0b1e7d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Apr 2018 11:21:48 -0400
 Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
@@ -7,7 +7,7 @@ This disables the behavior that allows players to keep chunks permanently loaded
 by default and allows server operators to enable it if they wish.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2bdedd83..ba5332c3 100644
+index 5a2fbf7c7..99d681ef1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -507,4 +507,10 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index 2bdedd83..ba5332c3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 55dada66..0eba3df5 100644
+index 55dada668..0eba3df57 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -148,7 +148,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -35,5 +35,5 @@ index 55dada66..0eba3df5 100644
  
          if (this.chunkLoader instanceof ChunkRegionLoader) {
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0290-Fix-exploit-that-allowed-colored-signs-to-be-created.patch

@@ -1,11 +1,11 @@
-From 53c121f673de01e7340d0bcfc5a1e72271647b6e Mon Sep 17 00:00:00 2001
+From 133271df1c5d0f9cccc880a70d733a173459c68c Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e6d0c636..a5faa6a0 100644
+index e6d0c6366..a5faa6a0a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2220,7 +2220,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index e6d0c636..a5faa6a0 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.13.3.windows.1
+2.18.0
 

Spigot-Server-Patches/0291-EndermanEscapeEvent.patch

@@ -1,4 +1,4 @@
-From adb90c86f6eba145015f676b640e17a119fdf6ca Mon Sep 17 00:00:00 2001
+From 62283507f331115942bc0e812186a79322de7f6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -77,5 +77,5 @@ index 2f59e7071..e8ea231dc 100644
                          }
  
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0292-Enderman.teleportRandomly.patch

@@ -1,4 +1,4 @@
-From 54a0c28176774e984ea077500e21a0b8a7c12e54 Mon Sep 17 00:00:00 2001
+From 254f29c68106283c645c9a8a8142fe261166f7e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 7b1fb6b7b..3038a9e2b 100644
+index e8ea231dc..4f8dd320f 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -198,6 +198,7 @@ public class EntityEnderman extends EntityMonster {
@@ -30,5 +30,5 @@ index f602c2313..7e6af5d02 100644
          IBlockData blockData = getHandle().getCarried();
          return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData.getBlock()).getNewData((byte) blockData.getBlock().toLegacyData(blockData));
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0293-Block-Enderpearl-Travel-Exploit.patch

@@ -1,4 +1,4 @@
-From a6a74a356098b9ba2b0a30e99e7792b198f5f325 Mon Sep 17 00:00:00 2001
+From 905de1056b56b89387ff40bdfa7ff1fb970f5979 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba5332c3..d1acf678 100644
+index 99d681ef1..03a9a96fc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -513,4 +513,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index ba5332c3..d1acf678 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 01c7fcc8..8e6428a0 100644
+index 01c7fcc8b..8e6428a0c 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -271,6 +271,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -39,5 +39,5 @@ index 01c7fcc8..8e6428a0 100644
          this.shooter = this.getShooter();
      }
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0294-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 7118f0ebbca12ac2411d5b01d905d4457116fd40 Mon Sep 17 00:00:00 2001
+From 7867cd96c0c87f5bac30a86077f260fc1dd8a4ea 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
@@ -56,5 +56,5 @@ index 568a50ec4..36dd8ad60 100644
                  true, // Extended range
                  x, y, z, // Position
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0295-EndermanAttackPlayerEvent.patch

@@ -1,4 +1,4 @@
-From be70ad267e3dbf854a44c8759f6ec8088b9c681a Mon Sep 17 00:00:00 2001
+From c4287ff854c237cfdb24c2916d48a2fb466d96c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 6ebfb12fb..6fc337706 100644
+index 4f8dd320f..2472edfc9 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -149,7 +149,15 @@ public class EntityEnderman extends EntityMonster {
@@ -28,5 +28,5 @@ index 6ebfb12fb..6fc337706 100644
  
          if (itemstack.getItem() == Item.getItemOf(Blocks.PUMPKIN)) {
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0296-WitchConsumePotionEvent.patch

@@ -1,4 +1,4 @@
-From 9e68005243fec04ecdaaaed5392473473f2e35f2 Mon Sep 17 00:00:00 2001
+From 0ac0977059b0e69fd5b9c30a6829727c1d846a43 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -23,5 +23,5 @@ index ffe72e037..3a00a37eb 100644
                          if (list != null) {
                              Iterator iterator = list.iterator();
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0297-WitchThrowPotionEvent.patch

@@ -1,4 +1,4 @@
-From eabbb64378c01313979e23f1e76ecfcf7920176e Mon Sep 17 00:00:00 2001
+From 9c93ec1eba8ee007df7a80f5e39c94c720511ea8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -27,5 +27,5 @@ index 3a00a37eb..bf029ad1c 100644
              entitypotion.pitch -= -20.0F;
              entitypotion.shoot(d1, d2 + (double) (f1 * 0.2F), d3, 0.75F, 8.0F);
 -- 
-2.17.0
+2.18.0
 

Spigot-Server-Patches/0298-Allow-spawning-Item-entities-with-World.spawnEntity.patch

@@ -1,4 +1,4 @@
-From 1bd75020d7f3a3ad3ec77930dc4fdf7be99ea430 Mon Sep 17 00:00:00 2001
+From 8a3bbe4ab353216233fecd288d92cbc72ac1188f 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
@@ -23,5 +23,5 @@ index 36dd8ad60..e88846bb5 100644
              entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
          } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0299-Don-t-load-chunks-for-villager-door-checks.patch

@@ -1,4 +1,4 @@
-From 9b8e555364e4a6273adc5c2c22f8f98a6fbf087e Mon Sep 17 00:00:00 2001
+From 86f3cd80c00f7fa9729c79ce9591fa1d3c3a44e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Don't load chunks for villager door checks
@@ -42,5 +42,5 @@ index 2eb33a986..9f1867ddd 100644
  
          return block instanceof BlockDoor ? iblockdata.getMaterial() == Material.WOOD : false;
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0300-WitchReadyPotionEvent.patch

@@ -1,4 +1,4 @@
-From 2bbf05040bd95dea82d291401c46bfc0d5e95ae1 Mon Sep 17 00:00:00 2001
+From 9c8a443bd16d12e35e96931e865678b6e836a316 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
@@ -22,5 +22,5 @@ index bf029ad1c..035aa4a90 100644
                      this.a(true);
                      this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.iz, this.bK(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0301-ItemStack-getMaxItemUseDuration.patch

@@ -1,4 +1,4 @@
-From f0635a630823c63d00fc43a9acf99936959670fc Mon Sep 17 00:00:00 2001
+From 8ea65950d9b4d8df5c2010024735ca8e1b810d87 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration

Spigot-Server-Patches/0302-Implement-EntityTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From cafe8cdd7183733d0701896b1d1a560255fc2faa Mon Sep 17 00:00:00 2001
+From 9996b666f6e907c564146779357ce22a4ac63434 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
@@ -30,5 +30,5 @@ index ecbc48b0c..557f06017 100644
  
              this.h();
 -- 
-2.15.1.windows.2
+2.18.0
 

Spigot-Server-Patches/0303-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch

@@ -1,4 +1,4 @@
-From 5799dcb1f539d2d4bab8ae470cf7be71d2c8bcbc Mon Sep 17 00:00:00 2001
+From 59229f9f6883b137fa2f63aa3e4cb239c607fb83 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
@@ -27,5 +27,5 @@ index 8098d4d9f..67ba72fc1 100644
              // CraftBukkit end
          }
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0304-Properly-remove-entities-on-dimension-teleport.patch

@@ -1,4 +1,4 @@
-From 95da0e7cef89c1762b8d624855186175c60cfcee Mon Sep 17 00:00:00 2001
+From 37c64784b97f49c37e278266605057cdddb6642d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
@@ -47,5 +47,5 @@ index 49019d54d..9fe5c4406 100644
          this.entitiesById.d(entity.getId());
          this.entitiesByUUID.remove(entity.getUniqueID());
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0305-Fix-CraftEntity-hashCode.patch

@@ -1,4 +1,4 @@
-From 19d1d25ea22f4d7d817dd9ab4194257099b4f27c Mon Sep 17 00:00:00 2001
+From 8d7875bba43bd5bab68aa8732e6260959dce1f7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -45,5 +45,5 @@ index 1571e4eb5..22a1a4965 100644
  
      public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0306-Configurable-Alternative-LootPool-Luck-Formula.patch

@@ -1,4 +1,4 @@
-From 7f8b6b7aef2aece4141fb984feba188636ca7aa8 Mon Sep 17 00:00:00 2001
+From 2870f8b28bc0f49e82b9269b24aadb7c4ad29403 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -104,5 +104,5 @@ index b2860555d..b5544bcf3 100644
      public abstract void a(Collection<ItemStack> collection, Random random, LootTableInfo loottableinfo);
  
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0307-Print-Error-details-when-failing-to-save-player-data.patch

@@ -1,4 +1,4 @@
-From fa416fb8b4e89b13fb4b6171c7f0f746612068a3 Mon Sep 17 00:00:00 2001
+From a6d2f167537708d9da83cf844106814128885259 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 20:37:03 -0400
 Subject: [PATCH] Print Error details when failing to save player data
@@ -18,5 +18,5 @@ index 4e33cc2f2..4bb6f600d 100644
  
      }
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,11 +1,11 @@
-From f66a15194cb9f3ecfa8b4bbfdc458493f5a73436 Mon Sep 17 00:00:00 2001
+From 06d831010a16e6244409d222fc86f1f5738077da Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 03a9a96f..99ad40fa 100644
+index 03a9a96fc..99ad40fa3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -519,4 +519,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 03a9a96f..99ad40fa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9adcabd4..65bc19b1 100644
+index 9adcabd4f..65bc19b17 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2481,7 +2481,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,7 +49,7 @@ index 9adcabd4..65bc19b1 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a7b07637..14fb474f 100644
+index a7b076377..14fb474f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -515,5 +515,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -69,5 +69,5 @@ index a7b07637..14fb474f 100644
      // Paper end
  }
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0309-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch

@@ -1,4 +1,4 @@
-From 4239f1b642632d1a77265622b23dc07b9dab6fae Mon Sep 17 00:00:00 2001
+From 9f81bd0698b9f2060806858c829ddf07f37fbe29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 16:23:38 -0400
 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
@@ -39,5 +39,5 @@ index 7eecdc9da..f65e74ebd 100644
  
          nbttagcompound.set("toBeDisplayed", nbttaglist1);
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From bad67ea53856fcc2b7519be08d4986c26218358d Mon Sep 17 00:00:00 2001
+From 633dbf5174ecd2ea261dbf0a3709068a3ec87180 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -80,5 +80,5 @@ index 5f816e44f..9b19c055d 100644
  
          return event;
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0311-PlayerReadyArrowEvent.patch

@@ -1,4 +1,4 @@
-From 28ac9602f72e89716a8862ab3cd5f6438a0dc000 Mon Sep 17 00:00:00 2001
+From c5616376719b637a47b3c51bb5642068fadacef3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -75,5 +75,5 @@ index 327d31e19..44e7be58e 100644
          if (!entityhuman.abilities.canInstantlyBuild && !flag) {
              return flag ? new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack) : new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0312-Fire-EntityShootBowEvent-for-Illusioner.patch

@@ -1,4 +1,4 @@
-From 8e5354672ebc3a56460bf7d8ddcd361ab93205d6 Mon Sep 17 00:00:00 2001
+From 84763ee9c003c8c59f1d2837ea35be85e0a4e085 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
@@ -29,5 +29,5 @@ index e03650448..ad81bd059 100644
  
      protected EntityArrow r(float f) {
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0313-Implement-EntityKnockbackByEntityEvent.patch

@@ -1,4 +1,4 @@
-From 7837bc68eb1d8b4b7d8fcf494f38e2b79631ba27 Mon Sep 17 00:00:00 2001
+From ea48866f00f5741865ee3aa7d770ef33d5759e73 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -42,5 +42,5 @@ index 65bc19b17..156bf8ee0 100644
      }
  
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0314-Expand-Explosions-API.patch

@@ -1,4 +1,4 @@
-From 39522bc9355d3dc704db0aa47bc546c66f81d936 Mon Sep 17 00:00:00 2001
+From a9510224625307f352a67679df732598e83cbae9 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
@@ -22,5 +22,5 @@ index e88846bb5..e2da30d88 100644
      public boolean createExplosion(Location loc, float power) {
          return createExplosion(loc, power, false);
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 55c6db5585ba2644c39b0d11995fb17862c5bd3f Mon Sep 17 00:00:00 2001
+From 9f02fc6f591f197d9531a73fc2148cac720c6fef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API

Spigot-Server-Patches/0316-RangedEntity-API.patch

@@ -1,4 +1,4 @@
-From 83f3723c5549505c1a6070099dc36512eb01a87e Mon Sep 17 00:00:00 2001
+From 310a55346fb4c29c0c78c44e4766086166d16c3c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API