[CI-SKIP] [Auto] Rebuild Patches

A recent commit has been made that caused patches to be out of order, rebuilding

Spigot-API-Patches/0126-PlayerLaunchProjectileEvent.patch

@@ -1,4 +1,4 @@
-From 771312c9e0119acefafffcaa9ea40dd0106e7ca9 Mon Sep 17 00:00:00 2001
+From 3db04f9ed8d1b8c20bbdb9b8bd1273568f68e9dc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:10:50 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
@@ -89,5 +89,5 @@ index 00000000..d2b244a4
 +    }
 +}
 -- 
-2.11.0
+2.18.0
 

Spigot-API-Patches/0127-PlayerElytraBoostEvent.patch

@@ -1,4 +1,4 @@
-From 9c611f7192a70e9c1118ae97750e25e5a62a7730 Mon Sep 17 00:00:00 2001
+From 431affd0e59e92ea462d7e56791ec22af7f3b9cc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:53 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
 new file mode 100644
-index 000000000..cecb2182c
+index 00000000..cecb2182
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
 @@ -0,0 +1,80 @@

Spigot-API-Patches/0128-EntityTransformedEvent.patch

@@ -1,4 +1,4 @@
-From e64b171a9f65f7ae93d6e7f017d5d136f1fa5e5f Mon Sep 17 00:00:00 2001
+From 7fafe644546eddc8321b487ee8a03974274877ba Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:28:53 -0400
 Subject: [PATCH] EntityTransformedEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
 new file mode 100644
-index 0000000..d9e5cab
+index 00000000..d9e5cab9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java
 @@ -0,0 +1,85 @@
@@ -96,5 +96,5 @@ index 0000000..d9e5cab
 +    }
 +}
 -- 
-2.8.4.windows.1
+2.18.0
 

Spigot-API-Patches/0129-Allow-disabling-armour-stand-ticking.patch

@@ -1,4 +1,4 @@
-From 800083976a454caf39f0a2019df51e3af314b022 Mon Sep 17 00:00:00 2001
+From 69a19d5e994e31333804ece1cae5f8c302e4a3cb Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:03 -0700
 Subject: [PATCH] Allow disabling armour stand ticking

Spigot-API-Patches/0130-SkeletonHorse-Additions.patch

@@ -1,4 +1,4 @@
-From 7ac4f5cdd7d311561825b74a6b6d229e84b68f2d Mon Sep 17 00:00:00 2001
+From d902c51da3d4b662256480ff4f1e308483cae199 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:17 -0500
 Subject: [PATCH] SkeletonHorse Additions
@@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 new file mode 100644
-index 000000000..55bae018e
+index 00000000..55bae018
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 @@ -0,0 +1,43 @@
@@ -54,7 +54,7 @@ index 000000000..55bae018e
 +}
 +
 diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-index b2c6b6a86..ba9983463 100644
+index b2c6b6a8..ba998346 100644
 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
 +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
 @@ -3,4 +3,12 @@ package org.bukkit.entity;

Spigot-API-Patches/0131-Expand-Location-Manipulation-API.patch

@@ -1,4 +1,4 @@
-From ef1b3e51447d82944f9f1b57d1656f6b0f8aca10 Mon Sep 17 00:00:00 2001
+From 6208bf2ad33541e3b5c47c286e8b6c8ab95e5fe5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:36:07 -0400
 Subject: [PATCH] Expand Location Manipulation API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index d0d86e1a4..253f0c2d5 100644
+index 056a4d6b..8dcb15fb 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -503,6 +503,51 @@ public class Location implements Cloneable, ConfigurationSerializable {

Spigot-API-Patches/0132-Expand-ArmorStand-API.patch

@@ -1,4 +1,4 @@
-From bd1bf2ef9b17f194f63a15d670410bdf8aa508e6 Mon Sep 17 00:00:00 2001
+From a309fe5f1304a0cfe9478215164836a8401e9728 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:22:44 -0400
 Subject: [PATCH] Expand ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 859f166fb..eda4873d5 100644
+index 859f166f..eda4873d 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -1,5 +1,6 @@

Spigot-API-Patches/0133-AnvilDamageEvent.patch

@@ -1,4 +1,4 @@
-From 15b281e9cf37ea9d4b929f459664d0a731ad4f45 Mon Sep 17 00:00:00 2001
+From 47e09a364611c02aefca7ef0c5af889f7fad8103 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:36:55 -0500
 Subject: [PATCH] AnvilDamageEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
 new file mode 100644
-index 000000000..fd3c5c02e
+index 00000000..fd3c5c02
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java
 @@ -0,0 +1,139 @@

Spigot-API-Patches/0134-Add-hand-to-bucket-events.patch

@@ -1,11 +1,11 @@
-From 67165721579587b8aa2da9db575fa501970e1bdb Mon Sep 17 00:00:00 2001
+From 74d80f95381c61a23d2c4f37adbded04b89c0e39 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:20 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
-index 8fb121a91..7b9596f30 100644
+index 8fb121a9..7b9596f3 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java
 @@ -5,6 +5,7 @@ import org.bukkit.block.Block;
@@ -30,7 +30,7 @@ index 8fb121a91..7b9596f30 100644
      public HandlerList getHandlers() {
          return handlers;
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
-index 56584687f..3dbe428ba 100644
+index 56584687..3dbe428b 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java
 @@ -5,6 +5,7 @@ import org.bukkit.block.Block;
@@ -82,7 +82,7 @@ index 56584687f..3dbe428ba 100644
          return cancelled;
      }
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
-index 94e042a36..884b9240b 100644
+index 94e042a3..884b9240 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java
 @@ -5,6 +5,7 @@ import org.bukkit.block.Block;

Spigot-API-Patches/0135-Add-TNTPrimeEvent.patch

@@ -1,4 +1,4 @@
-From 537ed31f439bcf3c179c8b9ee8478e395a931af0 Mon Sep 17 00:00:00 2001
+From 10885923bec70e8f6fa0b112d2946e1409f15f47 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 15 Jul 2018 22:17:55 +0300
 Subject: [PATCH] Add TNTPrimeEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
 new file mode 100644
-index 000000000..2ae8826bb
+index 00000000..2ae8826b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
 @@ -0,0 +1,108 @@

Spigot-API-Patches/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -1,4 +1,4 @@
-From 616d772c83bd89a4bb763dcf202fc1bc094b639b Mon Sep 17 00:00:00 2001
+From b812737b929851249cbbf6c0877d7064ec321c1d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API
@@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 079b9febe..c75bce07a 100644
+index 079b9feb..c75bce07 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -23,6 +23,15 @@ public interface Chunk {
@@ -27,7 +27,7 @@ index 079b9febe..c75bce07a 100644
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ba300c294..f84f151ad 100644
+index ba300c29..f84f151a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -137,6 +137,21 @@ public interface World extends PluginMessageRecipient, Metadatable {

Spigot-API-Patches/0137-Make-EnderDragon-extend-Mob.patch

@@ -1,11 +1,11 @@
-From 72a734adf9e87b7f06a82916aca7b02c09020ffc Mon Sep 17 00:00:00 2001
+From 88e2b4663b6c865344ab4ebe4ca003567ddc1a47 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:08:34 -0400
 Subject: [PATCH] Make EnderDragon extend Mob
 
 
 diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index 8f200e6c4..dad0b3141 100644
+index 8f200e6c..dad0b314 100644
 --- a/src/main/java/org/bukkit/entity/EnderDragon.java
 +++ b/src/main/java/org/bukkit/entity/EnderDragon.java
 @@ -3,7 +3,7 @@ package org.bukkit.entity;

Spigot-API-Patches/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -1,11 +1,11 @@
-From be69af0fbbb28f65f3bbbc30ab647010cf0bc0d4 Mon Sep 17 00:00:00 2001
+From eb7265ba1975febbd4b3abb77bc1e9111ea86090 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:04:58 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index c75bce07a..dc847340f 100644
+index c75bce07..dc847340 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -76,12 +76,24 @@ public interface Chunk {

Spigot-API-Patches/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch

@@ -1,11 +1,11 @@
-From 33e6d2fc56ffb361eafe4a240cad4529d548b7e8 Mon Sep 17 00:00:00 2001
+From 70f55e69ebfa66c2d67f4b2a8ec0e5224bb180f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:19:37 -0400
 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
-index c2c2fb838..769facd80 100644
+index c2c2fb83..769facd8 100644
 --- a/src/main/java/co/aikar/timings/TimingHistory.java
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -118,7 +118,7 @@ public class TimingHistory {

Spigot-Server-Patches/0300-PlayerLaunchProjectileEvent.patch

@@ -1,4 +1,4 @@
-From 056a868d854ffc68bc947d2da87f127811835aca Mon Sep 17 00:00:00 2001
+From 1709b17b36eafb7b2773189efa340bbe2cde6c77 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:11:03 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
@@ -269,5 +269,5 @@ index 7427f97d5..bc90d8936 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 -- 
-2.11.0
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From fda69eaf809ad4ff5d4ca6049727b82cb0119938 Mon Sep 17 00:00:00 2001
+From 25ec29d10b01eb5fb85595ca4bb62552210c0778 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7bd7aa0d94..37315233e1 100644
+index 7bd7aa0d9..37315233e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -430,4 +430,47 @@ public class PaperWorldConfig {
@@ -85,7 +85,7 @@ index 7bd7aa0d94..37315233e1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1997cbdc65..724c1f5720 100644
+index 1997cbdc6..724c1f572 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
@@ -167,7 +167,7 @@ index 1997cbdc65..724c1f5720 100644
              this.world.a((Collection) entityslice);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ff22feee4d..9ab6350587 100644
+index ff22feee4..9ab635058 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2724,6 +2724,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -179,7 +179,7 @@ index ff22feee4d..9ab6350587 100644
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fbca973225..064c31c035 100644
+index fbca97322..064c31c03 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -72,7 +72,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -192,7 +192,7 @@ index fbca973225..064c31c035 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> c = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 747d99dbe6..7a9f28421b 100644
+index 817915a0c..6b5b2c825 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -40,7 +40,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/0302-Add-async-chunk-load-API.patch

@@ -1,11 +1,11 @@
-From 1af69e8c1ce59acaeac3354b1117135675e903ef Mon Sep 17 00:00:00 2001
+From 6d356bb9a74eecd9bd4f08f3b9c9f4bf882e927f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 654e7cdfa2..512b457e10 100644
+index f94830838..9294d1707 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -156,6 +156,27 @@ public class CraftWorld implements World {

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

@@ -1,4 +1,4 @@
-From 88eeebc428981910419ea1d2409c2b86f31aef4f Mon Sep 17 00:00:00 2001
+From 9304997a2643d1fd0e09eaeae8e8e73f3f8c4bc5 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 37315233e1..044da2754d 100644
+index 37315233e..044da2754 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -473,4 +473,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 37315233e1..044da2754d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 4973721243..0e0c7b1abe 100644
+index 497372124..0e0c7b1ab 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -111,7 +111,7 @@ public class ChunkProviderServer implements IChunkProvider {

Spigot-Server-Patches/0304-Speedup-BlockPos-by-fixing-inlining.patch

@@ -1,4 +1,4 @@
-From 0168c3fb663c71d47314428a7fa2e686c2d9f910 Mon Sep 17 00:00:00 2001
+From 538a27fa51bcb0bacd20f3c17a1e54d7618a6999 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 58f8b4b720..98992513da 100644
+index 58f8b4b72..98992513d 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -80,7 +80,7 @@ index 58f8b4b720..98992513da 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 252e00e166..f769b178c6 100644
+index 252e00e16..f769b178c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -207,18 +207,20 @@ public class BlockPosition extends BaseBlockPosition {

Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch

@@ -1,4 +1,4 @@
-From e898f5e48550519d801479423c19d692e2c64fea Mon Sep 17 00:00:00 2001
+From 4febb90a55cb21eafa7a61834b43993a6abd5362 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
@@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart
 a new chunk generation process to begin with, so saving them serves no benefit.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ea868474..a97e024e 100644
+index ea8684747..a97e024ec 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -282,6 +282,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -20,7 +20,7 @@ index ea868474..a97e024e 100644
          world.checkSession();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 5d9118da..ca1516f2 100644
+index 5d9118daa..ca1516f2a 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -23,7 +23,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus

Spigot-Server-Patches/0306-Optimize-RegistryID.c.patch

@@ -1,4 +1,4 @@
-From 2720feea57f8841d8dcc99e884bc9b948b80f0b3 Mon Sep 17 00:00:00 2001
+From 4c81bab2e17f5e9c8afb165cab5b58681596325c Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index bde5714dd6..a01cda9d81 100644
+index bde5714dd..a01cda9d8 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix

Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch

@@ -1,11 +1,11 @@
-From 9d410de6f1e204c4c0bc29e27e56aa2248bf20f7 Mon Sep 17 00:00:00 2001
+From 742fffc7037d32a9903dd48a621a3079cdfa7a61 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 044da2754d..61c8b58b16 100644
+index 044da2754..61c8b58b1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -350,6 +350,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 044da2754d..61c8b58b16 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 064c31c035..4b03f19659 100644
+index 064c31c03..4b03f1965 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -11,6 +11,7 @@ import java.util.Iterator;

Spigot-Server-Patches/0308-Vanished-players-don-t-have-rights.patch

@@ -1,11 +1,11 @@
-From 89692da6f2aa8a27f1e53fb901890b590f84c1aa Mon Sep 17 00:00:00 2001
+From ea8f644f21fb302f74c22ceb661138121379104b Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9ab6350587..4315804ddb 100644
+index 9ab635058..4315804dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 9ab6350587..4315804ddb 100644
      protected int k;
      private Entity ax;
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index c8f305e6d6..b57f6efb3a 100644
+index c8f305e6d..b57f6efb3 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -179,6 +179,7 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
@@ -30,7 +30,7 @@ index c8f305e6d6..b57f6efb3a 100644
          return this.getBlock().f(this, iblockaccess, blockposition);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 1cecccef23..afc881d9af 100644
+index 1cecccef2..afc881d9a 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -70,7 +70,8 @@ public class ItemBlock extends Item {
@@ -44,7 +44,7 @@ index 1cecccef23..afc881d9af 100644
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), CraftBlockData.fromData(iblockdata), defaultReturn);
          blockactioncontext.getWorld().getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 53c9f21887..71e4084320 100644
+index 53c9f2188..71e408432 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -22,6 +22,7 @@ public abstract class VoxelShape {
@@ -64,7 +64,7 @@ index 53c9f21887..71e4084320 100644
          return this.a.a();
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4b03f19659..921add1dcb 100644
+index 4b03f1965..921add1dc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1558,6 +1558,37 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -106,7 +106,7 @@ index 4b03f19659..921add1dcb 100644
          if (voxelshape.b()) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cf398cd250..140ddae0d7 100644
+index cf398cd25..140ddae0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -804,6 +804,14 @@ public class CraftEventFactory {

Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch

@@ -1,11 +1,11 @@
-From 2bf2afcdc2d11ab205a42710969e4b1ddec97137 Mon Sep 17 00:00:00 2001
+From 08a7dc49c5a6a7b0742f31d1aaa6a29c1d892924 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 19:13:06 -0400
 Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index ca1516f2..94ba21f9 100644
+index ca1516f2a..94ba21f92 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -1,8 +1,10 @@

Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch

@@ -1,4 +1,4 @@
-From f213c595ea36e2936111b4a2e68ad183208d1f0d Mon Sep 17 00:00:00 2001
+From f839267a9bd602133ddec1f7a7f09992f178a81f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 724c1f5720..67e2158ca1 100644
+index 724c1f572..67e2158ca 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -714,6 +714,7 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch

@@ -1,4 +1,4 @@
-From f1edc0289d2b308fd8c73f64b58c8946913b6af5 Mon Sep 17 00:00:00 2001
+From d728994e934f85f2d2ddd3aa9f3f818f37781f52 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 67e2158ca1..e510940ab3 100644
+index 67e2158ca..e510940ab 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -712,8 +712,33 @@ public class Chunk implements IChunkAccess {
@@ -69,7 +69,7 @@ index 67e2158ca1..e510940ab3 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4315804ddb..785c31089e 100644
+index 4315804dd..785c31089 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -64,6 +64,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch

@@ -1,4 +1,4 @@
-From 3f17ec5d00f8b665bd1d1ded6821d3dcc1eafde6 Mon Sep 17 00:00:00 2001
+From 6f0a09ca79e5781043e323821dc960f61a5bf6bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 23:40:04 -0400
 Subject: [PATCH] Optimize Region File Cache
@@ -32,7 +32,7 @@ synchronized context, reducing lock times.
 Ultimately: This brings us back to Vanilla, which has had no indication of region file loss.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 3b8d01ea1a..609d6c3550 100644
+index 3b8d01ea1..609d6c355 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -97,7 +97,7 @@ public class RegionFileCache {

Spigot-Server-Patches/0313-repair-bad-rcon.ip-settings-temporarily.patch

@@ -1,4 +1,4 @@
-From dad3c99488eaf5ef540bfd4c1de8e161ab5ebbb7 Mon Sep 17 00:00:00 2001
+From bb296a9d83fdd412c04f308442a7c7460187d553 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:21:05 -0400
 Subject: [PATCH] repair bad rcon.ip settings temporarily
@@ -8,7 +8,7 @@ accidently missed mapping change, and we defaulted rcon.ip to the server.propert
 clean up values for people, drop this patch after like 2 weeks.
 
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index c237f239f3..1319b3b916 100644
+index c237f239f..1319b3b91 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -25,6 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread {

Spigot-Server-Patches/0314-EntityTransformedEvent.patch

@@ -1,11 +1,11 @@
-From 80d772279b2c0c80e6e1c6bc790ce53eafb3d127 Mon Sep 17 00:00:00 2001
+From c7e7b3da0039230bfce36229ca4753ef1277aa29 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index c6babe6af2..a7159ef964 100644
+index c6babe6af..a7159ef96 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -43,7 +43,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -18,7 +18,7 @@ index c6babe6af2..a7159ef964 100644
  
                  for (int i = 0; i < 5; ++i) {
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index b51543ea7a..51be54684e 100644
+index b51543ea7..51be54684 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -623,7 +623,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -31,7 +31,7 @@ index b51543ea7a..51be54684e 100644
              this.die();
          }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 2818ded921..d2d17094df 100644
+index 2818ded92..d2d17094d 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -233,7 +233,7 @@ public class EntityZombie extends EntityMonster {
@@ -52,7 +52,7 @@ index 2818ded921..d2d17094df 100644
              this.world.a((EntityHuman) null, 1026, new BlockPosition(this), 0);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 9f61523bec..b8b0d65921 100644
+index 9f61523be..b8b0d6592 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -130,7 +130,7 @@ public class EntityZombieVillager extends EntityZombie {

Spigot-Server-Patches/0315-SkeletonHorse-Additions.patch

@@ -1,11 +1,11 @@
-From 2912fb59c837b423ee607b068fbbbcbc258d7615 Mon Sep 17 00:00:00 2001
+From d886f78f7351f7af3c2e847154c55df41c56eb17 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 70985bf528..9fb86eefde 100644
+index 70985bf52..9fb86eefd 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index 70985bf528..9fb86eefde 100644
          if (flag != this.bN) {
              this.bN = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index f69170559c..cba8b91e55 100644
+index f69170559..cba8b91e5 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -13,6 +13,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index f69170559c..cba8b91e55 100644
  
          this.a.s(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200d..496d0c0cac 100644
+index e822c2200..496d0c0ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,23 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo

Spigot-Server-Patches/0316-Prevent-Saving-Bad-entities-to-chunks.patch

@@ -1,4 +1,4 @@
-From 0defa946320b46d507524d447a71b1e7581cf645 Mon Sep 17 00:00:00 2001
+From 26e17e3fae4ec2b114fbd0fe973eb26dc53c1d32 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a97e024ec4..bd52bf6561 100644
+index a97e024ec..bd52bf656 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -561,11 +561,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {

Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch

@@ -1,4 +1,4 @@
-From ae7939350e45292c194e58627882cd35417de85a Mon Sep 17 00:00:00 2001
+From 806e1b68cdd3f0484107a826448800c5d3f6b3d0 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta

Spigot-Server-Patches/0318-Always-process-chunk-removal-in-removeEntity.patch

@@ -1,4 +1,4 @@
-From fa3c3a5b10ac97ba9c7d813621b31a9510e5bb01 Mon Sep 17 00:00:00 2001
+From fe6d2dda85fd9986c6c9b5cbfaa4eaaa60fead62 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:09:20 -0400
 Subject: [PATCH] Always process chunk removal in removeEntity
@@ -8,7 +8,7 @@ which can keep them in the chunk when they shouldnt be if done
 during entity ticking.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 921add1dcb..ff0112c52a 100644
+index 921add1dc..ff0112c52 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1136,7 +1136,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

@@ -1,4 +1,4 @@
-From 165b2ca3d92767a2a413b8bb49c19f462c48049b Mon Sep 17 00:00:00 2001
+From f10e7ff6485116d84387c75904aca336a4bfc89c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 7ff8e70b24..4e854c6dbe 100644
+index 7ff8e70b2..4e854c6db 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index 7ff8e70b24..4e854c6dbe 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 785c31089e..6b0ca4eb98 100644
+index 785c31089..6b0ca4eb9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -122,6 +122,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 785c31089e..6b0ca4eb98 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ff0112c52a..82f4f00a76 100644
+index ff0112c52..82f4f00a7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1078,6 +1078,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -71,7 +71,7 @@ index ff0112c52a..82f4f00a76 100644
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 512b457e10..051e840507 100644
+index 9294d1707..b09f0353a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -660,6 +660,7 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch

@@ -1,4 +1,4 @@
-From 9bff4a5559678d038a09f40de52e945652283fda Mon Sep 17 00:00:00 2001
+From 303b6a7fc904210a40901143571f794a631bc7de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 11:58:05 -0400
 Subject: [PATCH] Always process chunk registration after moving
@@ -7,7 +7,7 @@ This will help guarantee that entities are always in the
 chunk that they are currently located at.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6b0ca4eb98..68b4a902eb 100644
+index 6b0ca4eb9..68b4a902e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -340,6 +340,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -27,7 +27,7 @@ index 6b0ca4eb98..68b4a902eb 100644
  
      protected SoundEffect ad() {
 diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java
-index f2d3d0b4c7..f20060614d 100644
+index f2d3d0b4c..f20060614 100644
 --- a/src/main/java/net/minecraft/server/EntityLeash.java
 +++ b/src/main/java/net/minecraft/server/EntityLeash.java
 @@ -31,6 +31,7 @@ public class EntityLeash extends EntityHanging {
@@ -39,7 +39,7 @@ index f2d3d0b4c7..f20060614d 100644
  
      public void setDirection(EnumDirection enumdirection) {}
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index 95c6cd8971..bc11e7da2b 100644
+index 95c6cd897..bc11e7da2 100644
 --- a/src/main/java/net/minecraft/server/EntityShulker.java
 +++ b/src/main/java/net/minecraft/server/EntityShulker.java
 @@ -385,6 +385,7 @@ public class EntityShulker extends EntityGolem implements IMonster {

Spigot-Server-Patches/0321-Provide-option-to-use-a-versioned-world-folder-for-t.patch

@@ -1,4 +1,4 @@
-From 7ac466f46eef301c130375deddd07c63e396e77e Mon Sep 17 00:00:00 2001
+From 10445a67042efb7969d2c60484cd0c5179619467 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 15:48:50 -0400
 Subject: [PATCH] Provide option to use a versioned world folder for testing
@@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
 This is highly experiemental so backup your world before relying on this to not modify it
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index bcdf4f91d8..c457d07110 100644
+index bcdf4f91d..c457d0711 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -13,6 +13,7 @@ import java.util.List;
@@ -59,7 +59,7 @@ index bcdf4f91d8..c457d07110 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index bd52bf6561..54840851ba 100644
+index bd52bf656..54840851b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -55,8 +55,56 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -146,7 +146,7 @@ index bd52bf6561..54840851ba 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 609d6c3550..f1fa7c7177 100644
+index 609d6c355..f1fa7c717 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -74,6 +74,13 @@ public class RegionFileCache {
@@ -164,7 +164,7 @@ index 609d6c3550..f1fa7c7177 100644
  
      public static synchronized void a() {
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 9a243010d0..3fabbe94f9 100644
+index 9a243010d..3fabbe94f 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -33,6 +33,58 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {

Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch

@@ -1,4 +1,4 @@
-From fd544f44ec3ea69345539647175ca4f392dab08e Mon Sep 17 00:00:00 2001
+From b8552d001501bd5afd095ed3d3308db8e93dbbce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 68b4a902eb..ce33cd5b83 100644
+index 68b4a902e..ce33cd5b8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -91,7 +91,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0323-Implement-Expanded-ArmorStand-API.patch

@@ -1,4 +1,4 @@
-From bb74cd20c9ff5d58520c15efae6774047afda322 Mon Sep 17 00:00:00 2001
+From a519ebd148ad0aa865562e84a88203a0af8c7584 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index e9a746f138..3b2b94d8c6 100644
+index e9a746f13..3b2b94d8c 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index e9a746f138..3b2b94d8c6 100644
          return (this.bH & 1 << enumitemslot.c()) != 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185bc..9f5c3b92e3 100644
+index 124c3185b..9f5c3b92e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {

Spigot-Server-Patches/0324-AnvilDamageEvent.patch

@@ -1,11 +1,11 @@
-From aba330fc2adbe136ffb43bd42ba13a203279a0ea Mon Sep 17 00:00:00 2001
+From de37067ca509b2e45d2aaefb6c72f589b5240cd3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index fb3413d81e..3b23ef9863 100644
+index fb3413d81..3b23ef986 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -73,6 +73,16 @@ public class ContainerAnvil extends Container {

Spigot-Server-Patches/0325-World-EntityHuman-Lookup-Optimizations.patch

@@ -1,11 +1,11 @@
-From 8974da202977345cc91552b465f0bf7512bdce78 Mon Sep 17 00:00:00 2001
+From 75d4f66b13ee5467d0726fa0497069072c3cee0c Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 30 Jul 2018 02:42:49 -0400
 Subject: [PATCH] World EntityHuman Lookup Optimizations
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 82f4f00a76..b0053e5e63 100644
+index 82f4f00a7..b0053e5e6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -79,6 +79,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

Spigot-Server-Patches/0326-Add-TNTPrimeEvent.patch

@@ -1,11 +1,11 @@
-From bb8c25d88fb656ac344c762bbeab2537aff796b0 Mon Sep 17 00:00:00 2001
+From fb461afc173ce4cfab4a85a5fb3f9b0ba222d778 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 25a8a1afdf..108006d580 100644
+index 25a8a1afd..108006d58 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -37,7 +37,7 @@ index 25a8a1afdf..108006d580 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 0c48a0cfe6..c3eeee2634 100644
+index 0c48a0cfe..c3eeee263 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -110,7 +110,7 @@ index 0c48a0cfe6..c3eeee2634 100644
                  world.setAir(blockposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index d8ab87e216..d5e2a02516 100644
+index d8ab87e21..d5e2a0251 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger;

Spigot-Server-Patches/0327-Break-up-and-make-tab-spam-limits-configurable.patch

@@ -1,4 +1,4 @@
-From a118ceac94cfcd9814c85880f46ae0a08e4e4fb7 Mon Sep 17 00:00:00 2001
+From 7d712b29921683cae6cd092b79c8755be117c923 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c457d07110..046bf33f66 100644
+index c457d0711..046bf33f6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -327,4 +327,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index c457d07110..046bf33f66 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f7401f5c98..6ebc0a95e2 100644
+index f7401f5c9..6ebc0a95e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/0328-Make-portal-teleportation-adjustment-math-more-accur.patch

@@ -1,11 +1,11 @@
-From 9798b5841235ed96bf6725d8e672296d92e6f066 Mon Sep 17 00:00:00 2001
+From 609a84e34e2803bc1cd1695dc985cc052b78d999 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 31 Jul 2018 19:32:57 -0500
 Subject: [PATCH] Make portal teleportation adjustment math more accurate
 
 
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 854ad49b6c..3ee310a9aa 100644
+index 854ad49b6..3ee310a9a 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -85,6 +85,7 @@ public enum EnumDirection implements INamable {
@@ -33,7 +33,7 @@ index 854ad49b6c..3ee310a9aa 100644
              return this.c;
          }
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index f52b9c6f0a..3adbfb8209 100644
+index f52b9c6f0..3adbfb820 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -82,6 +82,7 @@ public class MathHelper {
@@ -45,7 +45,7 @@ index f52b9c6f0a..3adbfb8209 100644
          return d0 < d1 ? d1 : (d0 > d2 ? d2 : d0);
      }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 7444f4621e..16ca3209cd 100644
+index 72b85bf60..67938e39c 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -208,11 +208,27 @@ public class PortalTravelAgent {
@@ -79,7 +79,7 @@ index 7444f4621e..16ca3209cd 100644
              float f1 = 0.0F;
              float f2 = 0.0F;
 diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
-index 3faf74a22f..4e1f8c211d 100644
+index 3faf74a22..4e1f8c211 100644
 --- a/src/main/java/net/minecraft/server/ShapeDetector.java
 +++ b/src/main/java/net/minecraft/server/ShapeDetector.java
 @@ -140,6 +140,7 @@ public class ShapeDetector {

Spigot-Server-Patches/0329-Add-hand-to-bucket-events.patch

@@ -1,11 +1,11 @@
-From f78970cd7bd76c58a9b27d56f68d832c4f512f7e Mon Sep 17 00:00:00 2001
+From b6e21438024c2fecf60c11b928939450135483c5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index b2010ffa6f..3493c4c44d 100644
+index b2010ffa6..3493c4c44 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -65,7 +65,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index b2010ffa6f..3493c4c44d 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 2c36c3990e..b38ee28532 100644
+index 2c36c3990..b38ee2853 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -37,7 +37,7 @@ public class ItemBucket extends Item {
@@ -67,7 +67,7 @@ index 2c36c3990e..b38ee28532 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          // TODO: inventory not updated
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 140ddae0d7..9037a1233a 100644
+index 140ddae0d..9037a1233 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -168,6 +168,20 @@ public class CraftEventFactory {

Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch

@@ -1,11 +1,11 @@
-From 4676b5f04e3fe5a120830eda2d70990e9babf5ea Mon Sep 17 00:00:00 2001
+From 74402109b3a2465c23b7f0d01973a1e7d5e92ca9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b8bfc75771..13299ad102 100644
+index b8bfc7577..13299ad10 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -205,14 +205,14 @@ public class EntityExperienceOrb extends Entity {

Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch

@@ -1,4 +1,4 @@
-From 05ba2bf241db3c4bc3e3d41d47723e9a260f5203 Mon Sep 17 00:00:00 2001
+From 0f4cf78346f2dc4ea140744c1e6342a38c0f0acf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 22:47:46 -0400
 Subject: [PATCH] Entity add to world fixes
@@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time
 the original entity is dead, overwrite it as the logic does for unloaod queued entities.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e510940ab3..db8fbc006d 100644
+index e510940ab..db8fbc006 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -902,6 +902,7 @@ public class Chunk implements IChunkAccess {
@@ -41,7 +41,7 @@ index e510940ab3..db8fbc006d 100644
          // CraftBukkit start
          org.bukkit.Server server = this.world.getServer();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b0053e5e63..004c3ec474 100644
+index b0053e5e6..004c3ec47 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1069,6 +1069,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -70,7 +70,7 @@ index b0053e5e63..004c3ec474 100644
              }
              this.entityList.add(entity);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7a9f28421b..6412715b78 100644
+index 6b5b2c825..f5911fbf0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -992,7 +992,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch

@@ -1,4 +1,4 @@
-From 8bf0e1d042523d99dcf185bfd7bb17df0639536b Mon Sep 17 00:00:00 2001
+From 3fdfd99ebcc2cac066c31c9fdce78f10675898e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index e52014fd8f..da11ec1672 100644
+index e52014fd8..da11ec167 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -44,7 +44,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index e52014fd8f..da11ec1672 100644
      private EntityItemFrame i;
      private ShapeDetectorBlock j;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index d04afceb70..b0e8ffc4b1 100644
+index d04afceb7..b0e8ffc4b 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -251,6 +251,15 @@ public class PacketDataSerializer extends ByteBuf {
@@ -62,7 +62,7 @@ index d04afceb70..b0e8ffc4b1 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 1aa36156a8..c5f0b85309 100644
+index 1aa36156a..c5f0b8530 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -38,6 +38,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -83,7 +83,7 @@ index 1aa36156a8..c5f0b85309 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 85fd8dab60..16a5537ce0 100644
+index 85fd8dab6..16a5537ce 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -143,9 +143,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa

Spigot-Server-Patches/0333-Add-Early-Warning-Feature-to-WatchDog.patch

@@ -1,4 +1,4 @@
-From cd1acb9c8bd6310d126bfdf7807a0168b4af9096 Mon Sep 17 00:00:00 2001
+From 57634937a40e3d655037eb5f2115d855d756221b Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 046bf33f66..b23d45f7df 100644
+index 046bf33f6..b23d45f7d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -24,6 +24,8 @@ import org.bukkit.configuration.InvalidConfigurationException;
@@ -37,7 +37,7 @@ index 046bf33f66..b23d45f7df 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 74c97b5db6..5fdd65b083 100644
+index 74c97b5db..5fdd65b08 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -768,6 +768,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -49,7 +49,7 @@ index 74c97b5db6..5fdd65b083 100644
                  long start = System.nanoTime(), lastTick = start - TICK_TIME, catchupTime = 0, curTime, wait, tickSection = start; // Paper - Further improve server tick loop
                  while (this.isRunning) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 4ac0ab9974..0c45d75adf 100644
+index 4ac0ab997..0c45d75ad 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -226,7 +226,7 @@ public class SpigotConfig
@@ -62,7 +62,7 @@ index 4ac0ab9974..0c45d75adf 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 57a4748a30..19df383e06 100644
+index 57a4748a3..19df383e0 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;

Spigot-Server-Patches/0334-Make-EnderDragon-implement-Mob.patch

@@ -1,11 +1,11 @@
-From 3d87918c9a23077f04961192f14a0ba3f7850f8e Mon Sep 17 00:00:00 2001
+From bd078ea2b755e78c6c7830d4be134225354c80cc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc368..4947249da2 100644
+index cc115cc36..4947249da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -1,17 +1,18 @@

Spigot-Server-Patches/0335-Detect-and-repair-corrupt-Region-Files.patch

@@ -1,4 +1,4 @@
-From 791918c4893844b0cb19a6cc9a4a717bd83a1509 Mon Sep 17 00:00:00 2001
+From 8873bfb4859720886eccaa3b3b4c929249a9a68f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Aug 2018 00:49:20 -0400
 Subject: [PATCH] Detect and repair corrupt Region Files
@@ -11,7 +11,7 @@ I don't know why mojang only checks for 4096, when anything less than 8192 is a
 But to be safe, it will attempt to back up the file.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index cba23731..07039223 100644
+index cba237312..070392233 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -41,7 +41,20 @@ public class RegionFile {

Spigot-Server-Patches/0336-Use-ConcurrentHashMap-in-JsonList.patch

@@ -1,4 +1,4 @@
-From b91e3e397c77e26889b815000b9831c5fdd333c3 Mon Sep 17 00:00:00 2001
+From 14c3fc13ab5d20894148bdf85a6eb21fefe908db Mon Sep 17 00:00:00 2001
 From: egg82 <phantom_zero@ymail.com>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 6700e68c06..a2815b91fd 100644
+index 6700e68c0..a2815b91f 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -36,7 +36,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {

Spigot-Server-Patches/0337-Use-a-Queue-for-Queueing-Commands.patch

@@ -1,4 +1,4 @@
-From 078e226f1090955d212304acb9c8397a51e48016 Mon Sep 17 00:00:00 2001
+From 4653eb3c1d85d35db694fb5e0ec08ccc5d1d4bef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8e15710caf..eae83ab9f2 100644
+index 8e15710ca..eae83ab9f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -39,7 +39,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

Spigot-Server-Patches/0338-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -1,11 +1,11 @@
-From 80f6f47ba434a4b53b71411540bedeb56cdbf512 Mon Sep 17 00:00:00 2001
+From 9cb417dcd3c77e4104ea9628013560ec19ffe518 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 0a47353b48..3238ca7420 100644
+index 0a47353b4..3238ca742 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -96,7 +96,12 @@ public class CraftChunk implements Chunk {

Spigot-Server-Patches/0339-Pass-World-to-Tile-Entity-Snapshots.patch

@@ -1,11 +1,11 @@
-From 15350e98eed7c1e36d8dd8da292355542963032b Mon Sep 17 00:00:00 2001
+From 7b82f52eaee912f0f66890193ac72a3634d2f6d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:19:04 -0400
 Subject: [PATCH] Pass World to Tile Entity Snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index d4d9c5fc50..a72bbdbedb 100644
+index d4d9c5fc5..a72bbdbed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -50,7 +50,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState

Spigot-Server-Patches/0340-Fix-NPE-Potential-in-CraftBanner.patch

@@ -1,11 +1,11 @@
-From 334b744d30a8992b3facf63bb4da6339d85345f0 Mon Sep 17 00:00:00 2001
+From 61cfeaadf39c294557e456dd4d5a0b1d7a165cb1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 08:46:20 -0400
 Subject: [PATCH] Fix NPE Potential in CraftBanner
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
-index 4332a03a41..4488321017 100644
+index 4332a03a4..448832101 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
 @@ -30,7 +30,7 @@ public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> impleme

Spigot-Server-Patches/0341-Allow-disabling-armour-stand-ticking.patch

@@ -1,11 +1,11 @@
-From 8088becc75a9d4d1ef01cbf85ff0445d06cf0215 Mon Sep 17 00:00:00 2001
+From bf9011addc8b350feb0b7de1e019e8dbdf8ffabe Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 61c8b58b16..458baf4442 100644
+index 61c8b58b1..458baf444 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -483,4 +483,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 61c8b58b16..458baf4442 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 3b2b94d8c6..7edeb9bb0e 100644
+index 3b2b94d8c..7edeb9bb0 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -45,6 +45,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -48,7 +48,7 @@ index 3b2b94d8c6..7edeb9bb0e 100644
          Vector3f vector3f = (Vector3f) this.datawatcher.get(EntityArmorStand.b);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 9f5c3b92e3..07ce93f17c 100644
+index 9f5c3b92e..07ce93f17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {

Spigot-Server-Patches/0342-Ensure-chunks-are-always-loaded-on-hard-position-set.patch

@@ -1,4 +1,4 @@
-From ee27ea20d00895926b5fe61aad162123283de3e4 Mon Sep 17 00:00:00 2001
+From 2ecc0414a79b9dc4e06d70a918ace76e8277f349 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Aug 2018 17:36:41 -0400
 Subject: [PATCH] Ensure chunks are always loaded on hard position sets
@@ -17,7 +17,7 @@ guaranteeing that the entity will be properly registered
 into its new home comfortably.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ce33cd5b83..41a951d580 100644
+index ce33cd5b8..41a951d58 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1367,6 +1367,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke