Update upstream B/CB/S

138 files changed, 301 insertions, 376 deletions

diff --git a/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 017b794085..f85ff0be80 100644
--- a/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0054-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,11 +1,11 @@
-From a95f24eee446165a8c8006583b0de0f793c168da Mon Sep 17 00:00:00 2001
+From e38ec7282ebbcd915a447b0f169b44928de95196 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 27cd0d43d..61032eb2f 100644
+index 5fbd12471..062a0fd55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -19,7 +19,7 @@ index 27cd0d43d..61032eb2f 100644
 +                    + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
          }
  
-         if (health == 0) {
+         getHandle().setHealth((float) health);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0079-Set-health-before-death-event.patch b/Spigot-Server-Patches/0079-Set-health-before-death-event.patch
deleted file mode 100644
index 5efb3cfdc5..0000000000
--- a/Spigot-Server-Patches/0079-Set-health-before-death-event.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4cea4a67fa45178c59807df4f21b86b09b88574e Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <[email protected]>
-Date: Sun, 19 Jul 2015 16:51:38 -0400
-Subject: [PATCH] Set health before death event
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b5ff26c71..6907d4680 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -215,4 +215,9 @@ public class PaperConfig {
-     private static void loadPermsBeforePlugins() {
-         loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
-     }
-+
-+    public static boolean setHealthBeforeDeathEvent = false;
-+    private static void healthDeath() {
-+        setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
-+    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 348a8c758..c0103cb39 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -102,11 +102,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-                     + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
-         }
- 
-+        // Paper start
-+        if (com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
-+            this.getHandle().setHealth((float) health);
-+        }
-+        
-         if (health == 0) {
-             getHandle().die(DamageSource.GENERIC);
-         }
- 
--        getHandle().setHealth((float) health);
-+        // Paper start - wrap, see above
-+        if (!com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
-+            getHandle().setHealth((float) health);
-+        }
-+        // Paper end
-     }
- 
-     public double getMaxHealth() {
--- 
-2.12.2.windows.2
-
diff --git a/Spigot-Server-Patches/0080-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 4261b88323..72be8681f4 100644
--- a/Spigot-Server-Patches/0080-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 59332750bfa25c9dafc31afa9d52f2442ec5205f Mon Sep 17 00:00:00 2001
+From cd0818fe9a15de0585fe4ad9816f44521361de2c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
@@ -56,5 +56,5 @@ index dd8380f71..0a9e8b9cd 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0081-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0080-Catch-Async-PlayerChunkMap-operations.patch
index e204f25dcb..942ceb6a8c 100644
--- a/Spigot-Server-Patches/0081-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0080-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,11 +1,11 @@
-From 7a4c9cc8f43dd8cb13ceafc6b4360c58a40c5e7a Mon Sep 17 00:00:00 2001
+From d47e6d67d27ac3f30c4c14493a48e9d5f53651d4 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <[email protected]>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9012a63a0..5b27bd1c5 100644
+index cfac05750..0a0b5261b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -469,10 +469,12 @@ public class PlayerChunkMap {
@@ -22,5 +22,5 @@ index 9012a63a0..5b27bd1c5 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0082-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0081-Support-offline-mode-in-whitelist-command-as-well.patch
index 4db1720329..2721eb3e98 100644
--- a/Spigot-Server-Patches/0082-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0081-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From 08efbaa590f1d22457b23dac04cc88535f84da74 Mon Sep 17 00:00:00 2001
+From 7166a39b822d5bf6d55376dcc7956a693891b0aa Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
@@ -89,5 +89,5 @@ index c74d1d2be..0f4237db1 100644
 +    // Paper end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0083-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0082-Fix-SkullCache-case-bug.patch
index 9113bf809b..95c2f551de 100644
--- a/Spigot-Server-Patches/0083-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0082-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From b15951b4c90b25f3db552de1d9032a5daf99fc43 Mon Sep 17 00:00:00 2001
+From a2147b31bd1fb9437f7c1798dfbe54094c5e63b6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
@@ -18,5 +18,5 @@ index 91ca4a279..edd6fb69e 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0084-Waving-banner-workaround.patch b/Spigot-Server-Patches/0083-Waving-banner-workaround.patch
index c78b289980..8ec9022ebe 100644
--- a/Spigot-Server-Patches/0084-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0083-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 9db8303c4d0edf7f783e2f8656b2f8f68fae80cb Mon Sep 17 00:00:00 2001
+From 96170e1bb8ded97c9342424fde70df1f8d058787 Mon Sep 17 00:00:00 2001
 From: Gabscap <[email protected]>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -34,5 +34,5 @@ index c5c3f40ce..6413f76e7 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0084-Use-a-Shared-Random-for-Entities.patch
index e133a7e842..892ec3a2e1 100644
--- a/Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0084-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From ce002ce8991131c9acfba45b64c942a8b97b932d Mon Sep 17 00:00:00 2001
+From af92277b1e36fec281d2486e1b8122f45b1b38b0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -27,5 +27,5 @@ index be54c807b..42bd79b10 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0085-Don-t-teleport-dead-entities.patch
index c4fedec25a..e362281189 100644
--- a/Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0085-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 3a9555ca894972a6e5c4e7bb7bf5d1e616235334 Mon Sep 17 00:00:00 2001
+From 9a7b6ab52a15652e1563cfd5517ccd2e3d88257e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -20,5 +20,5 @@ index 42bd79b10..70a431a63 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0086-Optimize-Chunk-Access.patch
index d8e864fa8c..75dc5c1e98 100644
--- a/Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0086-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 580a3c1e39db0c716b97f47e00d39ebd145d9d1c Mon Sep 17 00:00:00 2001
+From 8938542fec81aff213567b6bb3c3ffe88958597c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -42,5 +42,5 @@ index 0ad57afba..b49f4e292 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0087-Configurable-spawn-chances-for-skeleton-horses.patch
index 9913f36e53..e8c49f3fae 100644
--- a/Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0087-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 76935253a4bfcc967fde6cc7d3e034f537c6160d Mon Sep 17 00:00:00 2001
+From 80c0b91baf607f0b1625abbd20588b4be44c80c8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -19,7 +19,7 @@ index b37b5901b..adc810720 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ac8dc5f2f..39ed0d533 100644
+index 9b059e52c..de900920a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -436,7 +436,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index ac8dc5f2f..39ed0d533 100644
  
                              entityhorseskeleton.p(true);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0088-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index d3b68513b2..d3ce0f8e17 100644
--- a/Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0088-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From a76eee72a3134e780d7e75a0705c1db66c5e21e4 Mon Sep 17 00:00:00 2001
+From 1979a3eba27bfc1b815da4923498bbe652906e95 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -255,5 +255,5 @@ index 1d2d174e8..9427fc080 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0089-Fix-cooked-fish-legacy-import.patch
index c7e5591be4..e3a8e27d83 100644
--- a/Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0089-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From 0dcc62d3626178628c8a2f9e1c55a7a1d6e97ab7 Mon Sep 17 00:00:00 2001
+From 2625d905b5bca32ef5791458afd8467897344162 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
@@ -18,5 +18,5 @@ index 87b82eb35..a7c71f406 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0090-Access-items-by-EquipmentSlot.patch
index 80d3336bab..1bf5300d17 100644
--- a/Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0090-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From 9a9ff76273935fe0116ddb2fd757452542354c51 Mon Sep 17 00:00:00 2001
+From 17984e7eda68b702b546526305d27a2629e5a940 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -64,5 +64,5 @@ index 67c54899d..3f58c34e0 100644
 +    // Paper end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0091-Check-async-remove-unused-vars-GH-159.patch
index fe5c7ccbb9..bacda7af37 100644
--- a/Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0091-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From 5d65ae660c3bc6c62f38dc327121df456f8b9e32 Mon Sep 17 00:00:00 2001
+From a3ebbcc8a6227f77b06ad81db03bb9a514dfaa3d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
@@ -28,5 +28,5 @@ index c79fb7d57..8749a1879 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0092-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index e780e9b3b3..44a893438b 100644
--- a/Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0092-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From fb9b6e2de28107a733bfc5b55b4d446e115027fd Mon Sep 17 00:00:00 2001
+From c80926a9307c1543849b7120dcf44c831275834e Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -38,7 +38,7 @@ index 9427fc080..8cbdbda92 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 39ed0d533..f969d2a72 100644
+index de900920a..f80647b31 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -67,5 +67,5 @@ index 39ed0d533..f969d2a72 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0093-Entity-AddTo-RemoveFrom-World-Events.patch
index 249699e62f..91ae57bd1d 100644
--- a/Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0093-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From 92c341a06e29d044aae2b75fa6b940613ab4744f Mon Sep 17 00:00:00 2001
+From fbb0b9f15da52c572235a4a38164da7fd5aecc5b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@@ -25,5 +25,5 @@ index 8cbdbda92..f86c64cb2 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0094-Configurable-Chunk-Inhabited-Timer.patch
index df5d12d77f..11fa40d3db 100644
--- a/Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 49abb603029c245c5d3946c3a941437ceeae0c3c Mon Sep 17 00:00:00 2001
+From 898cc9c9a103418974e27f5ed4c82b96f954cef8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -36,5 +36,5 @@ index 736fa1f62..61d34fc37 100644
  
      public void c(long i) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0096-EntityPathfindEvent.patch b/Spigot-Server-Patches/0095-EntityPathfindEvent.patch
index 7d41201621..53c511170a 100644
--- a/Spigot-Server-Patches/0096-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0095-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 8b31a83fcf313a58a3d2657eb4a618fe27452a35 Mon Sep 17 00:00:00 2001
+From d3c9388de3e0dc2bbc6c1b12eb76d09c48af1d08 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index 43b2be505..c0ef2400b 100644
                  float f = this.h();
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0096-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index d0adde3580..80399aaf0f 100644
--- a/Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0096-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 58e7452d99c66366f890d624f3ee8315fe87eb8c Mon Sep 17 00:00:00 2001
+From 27d2f7402fbcc5a781235180d7e34cea0e58de11 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
@@ -48,5 +48,5 @@ index 0a2823686..8eba70b01 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0097-Reduce-IO-ops-opening-a-new-region-file.patch
index 0e9e804207..25cce3f154 100644
--- a/Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0097-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 4e9603ee0e06578012952c18fe907aff009b583c Mon Sep 17 00:00:00 2001
+From 74b4e2221ce77426cb87a083743e479e615b134d Mon Sep 17 00:00:00 2001
 From: Antony Riley <[email protected]>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
@@ -49,5 +49,5 @@ index ed840dbc9..4008a2143 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0098-Sanitise-RegionFileCache-and-make-configurable.patch
index 05510d35eb..63b825bcf2 100644
--- a/Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0098-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From e9bec1384df97f7d694ebfa1dad07e0ae0e3faab Mon Sep 17 00:00:00 2001
+From 4ed79ffa63f9c4560e4b94d5380a5244b7bf7a53 Mon Sep 17 00:00:00 2001
 From: Antony Riley <[email protected]>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -11,12 +11,12 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6907d4680..c3ff47e00 100644
+index b5ff26c71..62cbe0cf3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -220,4 +220,9 @@ public class PaperConfig {
-     private static void healthDeath() {
-         setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
+@@ -215,4 +215,9 @@ public class PaperConfig {
+     private static void loadPermsBeforePlugins() {
+         loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
 +
 +    public static int regionFileCacheSize = 256;
@@ -77,5 +77,5 @@ index 02b9bc8df..91b55074e 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0100-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0099-Use-Optimized-Collections.patch
index 44fc35b3bb..b33349086c 100644
--- a/Spigot-Server-Patches/0100-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0099-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From bf55746ae8469ec426c19372f7fd267fc13b976e Mon Sep 17 00:00:00 2001
+From 496ccba6660d6bbb0f5f685ddde99994b5dc8049 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -47,5 +47,5 @@ index 419add5db..820c15278 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0100-Do-not-load-chunks-for-light-checks.patch
index 0adcf8eaa8..0462266b84 100644
--- a/Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0100-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 0528c8e87adbb3e0ca9714a8c7cdada59d34319a Mon Sep 17 00:00:00 2001
+From ddaa32482b51ab2ef6141ae0e48d26565599be40 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -19,5 +19,5 @@ index f86c64cb2..7e6459654 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0101-Add-PlayerUseUnknownEntityEvent.patch
index a126211f05..c4f7d41ac0 100644
--- a/Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0101-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From ce229663241dcac2571047f5a1c9af02acd3c1c3 Mon Sep 17 00:00:00 2001
+From 3ef06b376d5d7091fa982931e4a0a66ff0f76a2d Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -39,5 +39,5 @@ index b67837dd2..840448995 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0102-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 4c32cb1f8c..0af00b8332 100644
--- a/Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0102-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,4 +1,4 @@
-From 797ffb13230f48f427a2a5e354dce5cc853ae481 Mon Sep 17 00:00:00 2001
+From 97885a33964fffa97584963cbe542dccb797b0bc Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
@@ -17,5 +17,5 @@ index 59c7e78b8..e303b45f0 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0103-Configurable-Grass-Spread-Tick-Rate.patch
index 38541c1730..58e4131f95 100644
--- a/Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0103-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From 408594ec2da3c56bb04e5789c7fb2ccaa85dd7c2 Mon Sep 17 00:00:00 2001
+From 1fe88d4e46aaa004cfaa8f6497721136ec46baf3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
@@ -32,5 +32,5 @@ index 8b43e6070..5cbc95f7c 100644
              int lightLevel = -1; // Paper
              if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index bcb8bf2f4f..5d2fd3826d 100644
--- a/Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0104-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From f825c7818bd1558c1371f174a954545f6959d539 Mon Sep 17 00:00:00 2001
+From 9f82f1d72fa9ec99080e660e69cee7822085bf44 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -83,5 +83,5 @@ index f65611a6a..9965235ab 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0105-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 87376f9ffe..88464f5552 100644
--- a/Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0105-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From a5d5dda4e43b4daafab005b8cf63e5eb148ebd56 Mon Sep 17 00:00:00 2001
+From 8ae180ad3f8cf80824fe419082538df82a2b0e2a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
@@ -17,5 +17,5 @@ index dba3fb167..44108ab9a 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0106-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index be3cddf75c..3a6ec1d5f3 100644
--- a/Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0106-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From 76d4bbc0f57b08ce52b6d3a4f3da9c7dc720c6e4 Mon Sep 17 00:00:00 2001
+From cc0692ecfec0f490e91b5c5665030027fd1d5843 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@@ -29,5 +29,5 @@ index a27512c0f..4691b3d8f 100644
      }
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0107-Remove-Debug-checks-from-DataBits.patch
index 6dad35ca53..64b12bf2bb 100644
--- a/Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0107-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From bc6666b8fea7c026847ea036395301569eae5fa2 Mon Sep 17 00:00:00 2001
+From 42daee8ec642e2c2ce5c8c9372e1d39e16443bd8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@@ -42,5 +42,5 @@ index f3a6799a8..fa0fd8a9c 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 64619cd9e0..3bd41fa9e3 100644
--- a/Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0108-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From c9d7dd9e35bd8ad3ec1b3ced918e0fdb1dae60b3 Mon Sep 17 00:00:00 2001
+From 6f11a33876ceebf398760bcd2bb8915910975f6c Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -51,5 +51,5 @@ index 840448995..dfbae01f4 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch
index 3296b0bd10..d343a88956 100644
--- a/Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0109-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From e5988d5b1cd40ac1a8b4fa2868e5214516b99c73 Mon Sep 17 00:00:00 2001
+From 5f2091113092bb84e8ce6b9e09c5042201d8508d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -28,5 +28,5 @@ index 0a9e8b9cd..8e06c2140 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0110-Remove-unused-World-Tile-Entity-List.patch
index 308096a20f..fefcd5b261 100644
--- a/Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0110-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 0ee8a42416c06bb0ac9c29ab71474a8f97e0006f Mon Sep 17 00:00:00 2001
+From d8532410334ad90c176c7553d1b3bca14f95f54b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -67,5 +67,5 @@ index 9bc8ce64c..2f4728b0d 100644
              }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0111-Don-t-tick-Skulls-unused-code.patch
index 8bfabdb113..12c1eddf20 100644
--- a/Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0111-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From 6f8419e69afc9f0873ee2f8d073fa6aee9c9ff7b Mon Sep 17 00:00:00 2001
+From 1223e6dd7d783c673abeef49cec9f7ef676fddd7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
@@ -18,5 +18,5 @@ index edd6fb69e..380373c0e 100644
      private int a;
      public int rotation;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0113-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0112-Configurable-Player-Collision.patch
index f5eff894ca..727b70f4a4 100644
--- a/Spigot-Server-Patches/0113-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0112-Configurable-Player-Collision.patch
@@ -1,14 +1,14 @@
-From 5c7d4a23609617b8822fa851a9550b15a8bcf6ee Mon Sep 17 00:00:00 2001
+From c11d79dd373a10c5cc3e190d7ac9f0fe1993463a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c3ff47e00..710c432d8 100644
+index 62cbe0cf3..dae321d01 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -225,4 +225,9 @@ public class PaperConfig {
+@@ -220,4 +220,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }
@@ -132,5 +132,5 @@ index e303b45f0..97322c5da 100644
  
      // CraftBukkit start
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0113-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 2d13371699..f785319849 100644
--- a/Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0113-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 5b040a6ee5d97a584ea1875d45f251066eb51e79 Mon Sep 17 00:00:00 2001
+From a6a5cd3d5aa8345b01724eb5073e1182ea389c06 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -45,5 +45,5 @@ index a46df4b7f..f02263c34 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0114-Water-mobs-should-only-spawn-in-the-water.patch
index 8f48e60239..f6d10e17d9 100644
--- a/Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0114-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From adfe939e1377279c32fe68488f5285302613c9ba Mon Sep 17 00:00:00 2001
+From a32a3ff851c3d8ff864c9597bd35a0b43dcb1c34 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
@@ -26,5 +26,5 @@ index 90d33af95..251555713 100644
  
      public boolean canSpawn() {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0115-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index f97633e425..dcd016b4ab 100644
--- a/Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0115-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From ce270a9774afd4425f09187b3dae122dab3a8943 Mon Sep 17 00:00:00 2001
+From 0210004d78643b561dbd88a5916cd55c9aae3dda Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -56,5 +56,5 @@ index 8749a1879..29d4c0866 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0116-Configurable-RCON-IP-address.patch
index 13d59c3dab..b77245f76f 100644
--- a/Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0116-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 82d1f04f8a674ab31b52e27e1987cd1785acf94d Mon Sep 17 00:00:00 2001
+From 176df0177590c48e6f57abcee6c554576fcec0a3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index a6a0d5a29..efcafe77f 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0117-Prevent-Fire-from-loading-chunks.patch
index d34de7efb8..b58eb95853 100644
--- a/Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0117-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 0cf6a91a4ecb498d0867e197dbffb42a5280a096 Mon Sep 17 00:00:00 2001
+From cf26fbf700eb4d7f23c9a35ef6cb56859d52ca39 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -47,5 +47,5 @@ index 94cb9d462..dfc328850 100644
  
              return i;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch
index 2afa48d599..6fd4dbde7b 100644
--- a/Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0118-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From facac094d3f1909ca5c2d0100b0f343591690b5c Mon Sep 17 00:00:00 2001
+From 543ab4972cabde6a82feebcf5145c143f8d8978f Mon Sep 17 00:00:00 2001
 From: Isaac Moore <[email protected]>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -50,5 +50,5 @@ index 8e06c2140..61c32223d 100644
  
          @Override
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0119-EntityRegainHealthEvent-isFastRegen-API.patch
index 7d44f74edf..a8ae4e91af 100644
--- a/Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0119-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 0be7d9227878e2d4b44885aa146bdbd64bda3fc5 Mon Sep 17 00:00:00 2001
+From 941eca8221f54c49f6bce1728a322e7e0657f08b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -41,5 +41,5 @@ index b6e978668..8d95d148f 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0120-Add-ability-to-configure-frosted_ice-properties.patch
index 014762288f..97e2307616 100644
--- a/Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0120-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 6a3db8a7752bb7e49c4577771c3b92c763c0e159 Mon Sep 17 00:00:00 2001
+From 9643be0fd3b1e25e36f7daf141052a94a429bf62 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
@@ -44,5 +44,5 @@ index 73855826e..f079c3389 100644
  
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0121-Vehicle-Event-Cancellation-Changes.patch
index 15ad6b94d2..341711e8a3 100644
--- a/Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0121-Vehicle-Event-Cancellation-Changes.patch
@@ -1,4 +1,4 @@
-From 293a7018d32c2e0e9aaf9eb4080530122a83d5fa Mon Sep 17 00:00:00 2001
+From 9e7656b1f8f69832a1bea2e23c6992bbaed9fe97 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
@@ -41,5 +41,5 @@ index 8908d8b8d..0f4a1b66b 100644
              entity.j = 60;
          }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0122-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 6413e2f607..5760428336 100644
--- a/Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0122-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From 043c470686058669deac012958193f1bddfa2a10 Mon Sep 17 00:00:00 2001
+From 5b807a76010dd4c8c21bc1108e17a5902329afc0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
@@ -51,5 +51,5 @@ index 528005446..b0d03e408 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0124-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0123-Improve-Minecraft-Hopper-Performance.patch
index 38e4153791..ce33e0af16 100644
--- a/Spigot-Server-Patches/0124-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0123-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From bf25b8717b9a888b98fe9542ac860429350c61bb Mon Sep 17 00:00:00 2001
+From b90b6e56102b563fc5dedfd20d1cfc5f901201d4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance
@@ -86,5 +86,5 @@ index 6acce15e7..44b6ecc5d 100644
          return this.f > 0;
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0125-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch
index f34b62446b..598e8fc384 100644
--- a/Spigot-Server-Patches/0125-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 13ae7fd9680c4c26bfb24bc38f5372dab2c0f303 Mon Sep 17 00:00:00 2001
+From 0beac52797d106b00aae3d72abf1377f736dbff9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -35,5 +35,5 @@ index 430168d21..83b62da55 100644
      // CraftBukkit end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0126-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 19c3943e2d..8307c446b7 100644
--- a/Spigot-Server-Patches/0126-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 7c6cdf790cf13759abac08cc78be4f7e82689711 Mon Sep 17 00:00:00 2001
+From 08d92972cd60988bb13c33c398aa89d95a90bf8a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
  
      public RenderData() {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0127-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch
index 24617487a0..e20d088029 100644
--- a/Spigot-Server-Patches/0127-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From bfc069f2e9f925c0f10d95b9cdbdd33ea8a3f8f7 Mon Sep 17 00:00:00 2001
+From 4bdde79d22ddc115153bde7b44d60857053d79b7 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -782,5 +782,5 @@ index e9963e21c..acb4dee04 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0128-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch
index cebfc41856..bfd96e0491 100644
--- a/Spigot-Server-Patches/0128-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From 0e544cd8d1e8174c68a97013f8898d58741d0340 Mon Sep 17 00:00:00 2001
+From 85ff0fddf7a0b1dc19f41b228fe5caf3f42cb199 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index 08b986fd7..786d1dd22 100644
          }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0129-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch
index 349a9c13ad..4e4b72a23a 100644
--- a/Spigot-Server-Patches/0129-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From d0d65d40d665bd4857968bce815a16b73fb71992 Mon Sep 17 00:00:00 2001
+From 21de603dbdcebdcb7c1a62e03632449f0a451c9b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -99,5 +99,5 @@ index fbda70a39..c28b4bd44 100644
  
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0130-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 5386a82010..4a67fa4e35 100644
--- a/Spigot-Server-Patches/0130-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,14 +1,14 @@
-From 0886e9d5e5edb0b883647a0ac6b83aa38b602b29 Mon Sep 17 00:00:00 2001
+From 677b710a49c80a8c885f6334378f6963c327e1af Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 710c432d8..e009e5cf2 100644
+index dae321d01..0140d1981 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -230,4 +230,9 @@ public class PaperConfig {
+@@ -225,4 +225,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }
@@ -31,5 +31,5 @@ index 230004b4a..62752f816 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0131-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 6d69b6cde3..81ccda8250 100644
--- a/Spigot-Server-Patches/0131-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From b45938c5752cc909b6cb49cef6768cda18a5788c Mon Sep 17 00:00:00 2001
+From 77fa2b88a5c877348527dfa1a8ca29fefaf8c520 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
@@ -44,5 +44,5 @@ index a6cf1d83d..3db29161d 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0132-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch
index c67db5d1ac..d0abdf1630 100644
--- a/Spigot-Server-Patches/0132-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 2f0e1a92eb0215f3ea7481cc54eeaf6b8ba23cac Mon Sep 17 00:00:00 2001
+From 73628dd99518293a492cdf8c7bd31afb60658535 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -34,5 +34,5 @@ index dd37bec73..eb3225ef2 100644
                              continue;
                          }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0133-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch
index 0b88f39dc8..07128c6f85 100644
--- a/Spigot-Server-Patches/0133-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From 16152841f16f55980d1d9ed723c60c33832f64c0 Mon Sep 17 00:00:00 2001
+From aa2f12ea92da0cbcf508cf4fa91f6f67a8d11247 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 6384d50e7..cb1fcf0f4 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0134-Optimize-EAR.patch b/Spigot-Server-Patches/0133-Optimize-EAR.patch
index 654afa58e1..754cec0ee0 100644
--- a/Spigot-Server-Patches/0134-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0133-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From a5d200f5f9ac0a6be1c90e383adeadc8b151e34a Mon Sep 17 00:00:00 2001
+From f686f64ca7c2f211887dcae3e9ecba481ddd12fe Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
@@ -65,5 +65,5 @@ index c411ce886..c8a6ff3d4 100644
                  }
              }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0135-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch
index 9097c497ae..4b478c45b8 100644
--- a/Spigot-Server-Patches/0135-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From f8298bd0e0b7b50c1e71d97df928320f537323e6 Mon Sep 17 00:00:00 2001
+From 0f23636d65d6937af2c1e37f32a255db6850b097 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -96,5 +96,5 @@ index ccfc755d2..989758cdf 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch
index 2318b30dd6..0003272572 100644
--- a/Spigot-Server-Patches/0136-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From fe563a5eab9483cb69f2b7bfc2c750fafe263b50 Mon Sep 17 00:00:00 2001
+From f06f7cc6fef5d2914a9bf5813503c35b7161fd04 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -43,5 +43,5 @@ index 6a71ebbd2..faf7b60af 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0137-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0136-Optional-old-TNT-cannon-behaviors.patch
index 1c9579533b..a3d99a89fb 100644
--- a/Spigot-Server-Patches/0137-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0136-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From 4570a07bfc85628581dfb4338637c0264f34df85 Mon Sep 17 00:00:00 2001
+From 05fa0e17dc7ea46a6a78ddf70e0f29d49edf114a Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional old TNT cannon behaviors
@@ -389,5 +389,5 @@ index d7bc6a0ed..f2785d86c 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0138-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch
index 305a5a21cf..efa0e61dbd 100644
--- a/Spigot-Server-Patches/0138-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From ae790beb03eba954c38947720990f2f273b1d4e0 Mon Sep 17 00:00:00 2001
+From f4d997da0a100cd7f4d80996a0ec158649a277e6 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -39,5 +39,5 @@ index 741236289..25a2a5d36 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0139-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch
index 31e23a2f55..6c39b1adfd 100644
--- a/Spigot-Server-Patches/0139-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 7dacb06906b8a49f5fff6ac5d3e13f44e0921a4b Mon Sep 17 00:00:00 2001
+From 0b6e33b6561edbc1426fe841e946b158e730a33c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -42,5 +42,5 @@ index b5efb9c3f..ef9529add 100644
              return;
          }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0140-Add-server-name-parameter.patch b/Spigot-Server-Patches/0139-Add-server-name-parameter.patch
index fcf79c9900..2b8a5ddc0a 100644
--- a/Spigot-Server-Patches/0140-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0139-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From c325795fa35577349654d913c5be60aeddd6e6b4 Mon Sep 17 00:00:00 2001
+From 0b2f9708eadcdc00cf1248ef7f25a6686d2f9383 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
@@ -24,5 +24,5 @@ index 4399faf69..59d4e2e6f 100644
          };
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0141-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index a646c2821f..b832224954 100644
--- a/Spigot-Server-Patches/0141-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 309f96980dba21738a6b1d9d802bc2c9f67301b4 Mon Sep 17 00:00:00 2001
+From 552bbf4ff08db7dc30722e581a6bb019e8ef12cc Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -44,5 +44,5 @@ index 9af34ba60..031507574 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0142-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch
index 0d6f9e3dd3..eae2676b41 100644
--- a/Spigot-Server-Patches/0142-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From a57b2a20bfc3edce691470ca6def1e166dc6cfa4 Mon Sep 17 00:00:00 2001
+From 2ffd7565f95c0fe3ddef701c688263469aeb42ae Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -102,5 +102,5 @@ index bb01929e8..8059e6dcd 100644
          Block block = this.block.getBlock();
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0143-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch
index 125875ed30..3e267a0187 100644
--- a/Spigot-Server-Patches/0143-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From 5e24b91319bb930c470e28e5751d7f9b758fe063 Mon Sep 17 00:00:00 2001
+From b6948fdd96baaba6bb2ef88bb94c34a355ffa1b5 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
@@ -378,5 +378,5 @@ index 44b6ecc5d..022e64520 100644
  
              if (!list.isEmpty()) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0144-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 6faf012e78..792359d7f5 100644
--- a/Spigot-Server-Patches/0144-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 42eb9c7ff29419933afefaaa21c757752b817666 Mon Sep 17 00:00:00 2001
+From a725b4f641d3fd25f235a4d4e4d9ff73ae7e03c3 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -108,7 +108,7 @@ index dd40e98c8..f109e986d 100644
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 5b27bd1c5..b163346be 100644
+index 0a0b5261b..14ea89c91 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -487,7 +487,13 @@ public class PlayerChunkMap {
@@ -140,5 +140,5 @@ index 9965235ab..3f8859a1f 100644
              }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0145-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch
index ecdf42102c..6f0ee07839 100644
--- a/Spigot-Server-Patches/0145-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From dcfa2ba7251ae9627d3dda488cbdf7e3cc31892e Mon Sep 17 00:00:00 2001
+From e886fbb60bda14fbb78a182375a6de088da67aaf Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <[email protected]>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -41,5 +41,5 @@ index ec901150d..b8ac99e5d 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0146-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch
index a77b14b155..93f656a4c5 100644
--- a/Spigot-Server-Patches/0146-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 54c81de7d1b0aa3d7741b255d4fda4f562d20c8a Mon Sep 17 00:00:00 2001
+From 98c65b22db11cb425f4426f1b52114971dcf12f0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -33,5 +33,5 @@ index 7ed3a0677..7900fca57 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0147-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch
index e1c05a0160..489c4a987d 100644
--- a/Spigot-Server-Patches/0147-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 0ae70ecc0b9df6e3dfedfaa196ff7d1484f59294 Mon Sep 17 00:00:00 2001
+From d2dfe71fdaf52ea8e53deeba1362d3db3c40a09d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -67,5 +67,5 @@ index 34ade146c..242552c36 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0148-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 6d6b6cb12a..ab34941696 100644
--- a/Spigot-Server-Patches/0148-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From 8596066290cfcde927c9d9f5b49898b3788e6f3e Mon Sep 17 00:00:00 2001
+From 150459125f9aefe49a503c6cb1aa048d03291684 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
@@ -18,5 +18,5 @@ index 989758cdf..1c619c596 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0149-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch
index eb3786568a..fdcb3005d3 100644
--- a/Spigot-Server-Patches/0149-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,4 +1,4 @@
-From 6d446eaa300db8b349d0c5813e6bf2758beb8816 Mon Sep 17 00:00:00 2001
+From 372f6272bcaf410777335b661a2d091b296c12c2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
@@ -18,5 +18,5 @@ index dfbae01f4..4b79031f0 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0150-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch
index 0cee8d1517..4da3b93c61 100644
--- a/Spigot-Server-Patches/0150-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From db3336329ce3d39657824be9a6af3f84b4123532 Mon Sep 17 00:00:00 2001
+From 470600a7c74fb5ee9f01d43ee827e576c98c722e Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
@@ -23,5 +23,5 @@ index ad1bb7bab..4e8efc549 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0151-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch
index ac0ecea9c3..343e4f278f 100644
--- a/Spigot-Server-Patches/0151-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch
@@ -1,14 +1,14 @@
-From a9a7d486128aa9801cbc4733db287bd1dadb961f Mon Sep 17 00:00:00 2001
+From c6c96c233b11b2ad11e28e3a11f8a3f7be84440e Mon Sep 17 00:00:00 2001
 From: Gabriele C <[email protected]>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e009e5cf2..276185d9a 100644
+index 0140d1981..c758bde3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -235,4 +235,9 @@ public class PaperConfig {
+@@ -230,4 +230,9 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }
@@ -47,5 +47,5 @@ index a958ce998..8ade16865 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0152-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 234464447e..3a10a5d65f 100644
--- a/Spigot-Server-Patches/0152-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 451df5c9f607c0f8f087b70c06ec5736521cf7b6 Mon Sep 17 00:00:00 2001
+From f42b3e088cb525e1c0fe54aca194267261a4d53e Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
@@ -58,5 +58,5 @@ index 288c52c55..66c459d83 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0153-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch
index 35bcecdf5f..e90bdb0360 100644
--- a/Spigot-Server-Patches/0153-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From b1c66cf190817911beb2855fba6f91504dc805ef Mon Sep 17 00:00:00 2001
+From 4696c453f870dd2315654441c612af5f24fa0277 Mon Sep 17 00:00:00 2001
 From: killme <[email protected]>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
@@ -34,5 +34,5 @@ index 8123d7295..b6765e5bc 100644
 +    //Paper end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0154-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch
index f5b59c4d9b..32469596b0 100644
--- a/Spigot-Server-Patches/0154-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,4 +1,4 @@
-From aeab5af95f6f6914dab1a5752c42c8e387113e62 Mon Sep 17 00:00:00 2001
+From 8dae01a4e5890255459de98f20d4bc36d50c0aea Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
@@ -18,5 +18,5 @@ index 4b79031f0..060434f32 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0155-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch
index f8f6bad143..c997561f3b 100644
--- a/Spigot-Server-Patches/0155-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch
@@ -1,14 +1,14 @@
-From 866083bdb8aff3ba41f93b93486c5150d86bb6bf Mon Sep 17 00:00:00 2001
+From b81c66363a4118495a786c69be2c447d6c0c24d7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 276185d9a..bb4114b8d 100644
+index c758bde3f..d765607c0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -240,4 +240,13 @@ public class PaperConfig {
+@@ -235,4 +235,13 @@ public class PaperConfig {
      private static void bungeeOnlineMode() {
          bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
      }
@@ -44,5 +44,5 @@ index 060434f32..6281fe4d5 100644
              limitedPackets = 0;
              return true;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0156-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch
index 291f24eda7..4bb2847159 100644
--- a/Spigot-Server-Patches/0156-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch
@@ -1,14 +1,14 @@
-From 9f4d0c83940ae2666504ab4a5625b894be1d162a Mon Sep 17 00:00:00 2001
+From 611ccc1d0db15c1a217e6657c25061e186b55fac Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index bb4114b8d..f86729724 100644
+index d765607c0..5b4d715a4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -249,4 +249,11 @@ public class PaperConfig {
+@@ -244,4 +244,11 @@ public class PaperConfig {
          }
          packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
      }
@@ -43,5 +43,5 @@ index 6281fe4d5..51d27351d 100644
                  }
              } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0157-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch
index 0c670e551c..c243f7732b 100644
--- a/Spigot-Server-Patches/0157-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From f2eb7e545edd482486bfd002608f6b2b12d44d78 Mon Sep 17 00:00:00 2001
+From 10bec1ccae8ee9a59d53ee9f8cfd63e25dd672b0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,10 +12,10 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f86729724..009bf0c8b 100644
+index 5b4d715a4..db2a4c2c7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -256,4 +256,9 @@ public class PaperConfig {
+@@ -251,4 +251,9 @@ public class PaperConfig {
          flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
          flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
      }
@@ -192,7 +192,7 @@ index 97322c5da..58f30fb1d 100644
      public void addWhitelist(GameProfile gameprofile) {
          this.whitelist.add(new WhiteListEntry(gameprofile));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f969d2a72..cc0e8d2c8 100644
+index f80647b31..914c20282 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1003,8 +1003,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -215,5 +215,5 @@ index f969d2a72..cc0e8d2c8 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0158-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0157-Chunk-registration-fixes.patch
index 21c5628bcf..ab593e8a4c 100644
--- a/Spigot-Server-Patches/0158-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0157-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 08b118ed5d51e80df7a701c4e11e5ed101207af7 Mon Sep 17 00:00:00 2001
+From 5b803f915ccef730653e1ea6967e70338823acfc Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -21,5 +21,5 @@ index 7900fca57..ec0a28cff 100644
  
              if (!entity.aa || entity.ab != k || entity.ac != l || entity.ad != i1) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0159-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 8d086b5d38..b47f968f35 100644
--- a/Spigot-Server-Patches/0159-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From 0277b11a48f2d4779dd56452aef42aa40783cc43 Mon Sep 17 00:00:00 2001
+From 72e2ee049939547f6a414dc2073623d0e92ac7ad Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
@@ -26,5 +26,5 @@ index ecfc316bb..3f909c174 100644
      public LivingEntity _INVALID_getShooter() {
          return (LivingEntity) getShooter();
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0160-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch
index e3ab9eed6a..08afe0ba10 100644
--- a/Spigot-Server-Patches/0160-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From e83fee4c7a5c51bb48c0ae699d12de348ae8589c Mon Sep 17 00:00:00 2001
+From d457b6a577beb04924db4c75c5bb610a7cad5172 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -18,5 +18,5 @@ index 55c966811..eca224bdb 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0161-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch
index 39138523f5..327cd74605 100644
--- a/Spigot-Server-Patches/0161-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From cfc4ef10920340b7a0d02dc201354ac16d37f0a2 Mon Sep 17 00:00:00 2001
+From f01e946cd553cc38c4918261a5ce78b14ca9148f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
@@ -23,5 +23,5 @@ index 7a6619595..68e8c4671 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0162-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch
index d8ce8e3dd0..330b21ef24 100644
--- a/Spigot-Server-Patches/0162-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 0a4cad3330e7c5b0b4b157b4a143a809b9cd4cca Mon Sep 17 00:00:00 2001
+From 4bbddef682f6f34766f801b6d4d44e708ecbc012 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index cc0e8d2c8..7a6d11f20 100644
+index 914c20282..fdec385a7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1020,7 +1020,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -29,5 +29,5 @@ index cc0e8d2c8..7a6d11f20 100644
          }
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0163-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch
index 41816497e2..6a66669b3b 100644
--- a/Spigot-Server-Patches/0163-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From c7e769e167626264f0fbc8a15080adcae1c4765e Mon Sep 17 00:00:00 2001
+From c6711570e26da30de8b22ada8efc31c8064332b4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
@@ -41,5 +41,5 @@ index 9f7f32dc2..d850dbfc3 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0164-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0163-Add-EntityZapEvent.patch
index 4c2297020c..53a79693a7 100644
--- a/Spigot-Server-Patches/0164-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0163-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From dd9888bc9fafe9ec3bb38dc92d335f9f045ead78 Mon Sep 17 00:00:00 2001
+From 1d895849c5a89f88a05f458af94f6b9d803675d0 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <[email protected]>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -48,7 +48,7 @@ index ee11691bf..4ad75468c 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 95b12331e..4d252aa47 100644
+index 8158c4801..d77eefd6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -673,6 +673,14 @@ public class CraftEventFactory {
@@ -67,5 +67,5 @@ index 95b12331e..4d252aa47 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0165-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index a36549ef22..c39256061b 100644
--- a/Spigot-Server-Patches/0165-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From d766004f07f7cb887283db77e0adc5ca4307c7b5 Mon Sep 17 00:00:00 2001
+From 0b59bda9e5d84d262d223225d2f651a71c5509b5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -32,5 +32,5 @@ index 9c4d1c938..dd1c1a39b 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0166-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 7bf4352f6e..684f7b50a5 100644
--- a/Spigot-Server-Patches/0166-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 76378e2f8f15b2354bbaeda957cd43eb6617d578 Mon Sep 17 00:00:00 2001
+From e58b0d4d3e4c3ead75b9d947c623d2a4c3f5a2c8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -64,5 +64,5 @@ index 90d069539..895882b2e 100644
      @Nullable
      public Chunk a(World world, int i, int j) throws IOException {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0167-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch
index bd9288df3c..12eed5c3cd 100644
--- a/Spigot-Server-Patches/0167-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From ebb2c9fa657f2f5ed42df82a3b7ef1a5461027f4 Mon Sep 17 00:00:00 2001
+From be59543734bad0e37b427a97923e1f19e17981e5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -90,5 +90,5 @@ index 895882b2e..a4c0b0c96 100644
              boolean flag;
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0168-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index dec12bc5de..91bfa3f733 100644
--- a/Spigot-Server-Patches/0168-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From fbcfb4bcbf57547d045729d75dac619eacc7b088 Mon Sep 17 00:00:00 2001
+From 93024000bb59f83c6c3e82e9763eba5932602285 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
@@ -61,5 +61,5 @@ index 1a01a57d2..f914ad417 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0169-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch
index e337a7739a..3edec855f0 100644
--- a/Spigot-Server-Patches/0169-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From 08f57ad5059ec5d13942f6abd194ce96003c043a Mon Sep 17 00:00:00 2001
+From 6dfeaccf94937055658d2d3e6114747d74de1c0c Mon Sep 17 00:00:00 2001
 From: vemacs <[email protected]>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@@ -63,5 +63,5 @@ index fe390feb9..350ec0323 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0170-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0169-Optimize-Network-Queue.patch
index c41e4677f0..575aeb357f 100644
--- a/Spigot-Server-Patches/0170-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0169-Optimize-Network-Queue.patch
@@ -1,4 +1,4 @@
-From 50c7768c8c2458a09c65ab4034ee134336d33dc3 Mon Sep 17 00:00:00 2001
+From 6db31d93eadd2ffae7b1d5816003322da14fd719 Mon Sep 17 00:00:00 2001
 From: vemacs <[email protected]>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
@@ -18,5 +18,5 @@ index 8134501c7..8df30e3d0 100644
      private long ab = aw();
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0171-Optimise-NetworkManager.patch b/Spigot-Server-Patches/0170-Optimise-NetworkManager.patch
index 05fc8a2868..cc8a649f43 100644
--- a/Spigot-Server-Patches/0171-Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/0170-Optimise-NetworkManager.patch
@@ -1,4 +1,4 @@
-From 863b08010dbfe4e4046e553ced31acb9c2d2fde1 Mon Sep 17 00:00:00 2001
+From 7c2676da97136793b6b5c32c9f7770cdd7433e7e Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
@@ -121,5 +121,5 @@ index 184ef32a8..be14c0b25 100644
  
          }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0172-Optimise-removeQueue.patch b/Spigot-Server-Patches/0171-Optimise-removeQueue.patch
index fae4b557f1..bd42c2de1d 100644
--- a/Spigot-Server-Patches/0172-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0171-Optimise-removeQueue.patch
@@ -1,4 +1,4 @@
-From e11ca040e04967c5991c13652e8d683f5d05d191 Mon Sep 17 00:00:00 2001
+From 590f1a604da843d882d511958377ec6bfa13bb3e Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
@@ -61,5 +61,5 @@ index eca224bdb..58d40f994 100644
  
      protected void a(MobEffect mobeffect) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0173-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch
index 4a2ea54a79..a6532b23ef 100644
--- a/Spigot-Server-Patches/0173-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0172-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From f54fafe71613988b003a239c2491d3f8c0f7e709 Mon Sep 17 00:00:00 2001
+From 5f05d8d730fadd1de8f2b8a1ffdae85e73f59d47 Mon Sep 17 00:00:00 2001
 From: willies952002 <[email protected]>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -35,5 +35,5 @@ index 8ade16865..326196ce4 100644
      // Paper end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0174-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0173-Add-source-to-PlayerExpChangeEvent.patch
index ad7453f5b1..8e747eea47 100644
--- a/Spigot-Server-Patches/0174-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0173-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 5423a90a37ac2a7ed6e5aef52861e2d0d41c204f Mon Sep 17 00:00:00 2001
+From 8ecc6cb3b0e33dce1b8f86944ac73c3360f9dea0 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <[email protected]>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -18,7 +18,7 @@ index 4b3816465..14431b8ad 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4d252aa47..7e4982d93 100644
+index d77eefd6f..999e38878 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
@@ -48,5 +48,5 @@ index 4d252aa47..7e4982d93 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0175-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0174-Optimize-World.isLoaded-BlockPosition-Z.patch
index 50313c9821..f465838b3a 100644
--- a/Spigot-Server-Patches/0175-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0174-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 4f91a4c59c79d3e9f13ab9061515227913e5b92b Mon Sep 17 00:00:00 2001
+From 137eaf141e58f37e6faed980ff5da54fe3af19c8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -19,5 +19,5 @@ index ec0a28cff..2fa63a27f 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0176-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0175-Speedup-BlockPos-by-fixing-inlining.patch
index 899acc0466..a73447a2e0 100644
--- a/Spigot-Server-Patches/0176-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0175-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From a883117f5ebe4bf5f8179f3f2b6fb6b3e83ac45d Mon Sep 17 00:00:00 2001
+From 89a39560a29c994a9dd297380e5f0c9159f9a51a Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -177,5 +177,5 @@ index b3c1f550c..6a0b3a62d 100644
  
          public BlockPosition h() {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0177-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0176-Don-t-let-fishinghooks-use-portals.patch
index 7fbe780ae5..e2bf832618 100644
--- a/Spigot-Server-Patches/0177-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0176-Don-t-let-fishinghooks-use-portals.patch
@@ -1,4 +1,4 @@
-From f007be7ce27bdac76b9af0e066adcab134ce3f56 Mon Sep 17 00:00:00 2001
+From eb98988832cfa45d91fdafe9f11e2ad7535a7ad6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
@@ -35,5 +35,5 @@ index 0c528c699..606160a17 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0178-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0177-Add-ProjectileCollideEvent.patch
index 3b2e548ba1..141d90c03b 100644
--- a/Spigot-Server-Patches/0178-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0177-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 29af77dd9cc1266a6f29936bae339983f799055c Mon Sep 17 00:00:00 2001
+From 7aee300956e5692856336b83dbb238c2ffa47d97 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@@ -86,7 +86,7 @@ index 6fbc84559..a8b9d9263 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7e4982d93..a850a9634 100644
+index 999e38878..e669f0878 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -794,6 +794,16 @@ public class CraftEventFactory {
@@ -107,5 +107,5 @@ index 7e4982d93..a850a9634 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0179-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0178-Vanished-players-don-t-have-rights.patch
index f66dca0030..6326dd4955 100644
--- a/Spigot-Server-Patches/0179-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0178-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 5b717c8de16974c9eec0185c3b003fddd49dc26a Mon Sep 17 00:00:00 2001
+From 38a9642500cf81514132e024d64d567d2b3c0d06 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -78,7 +78,7 @@ index 2fa63a27f..7af76e14c 100644
          this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a850a9634..59942d9cb 100644
+index e669f0878..afdd4ab70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -799,6 +799,13 @@ public class CraftEventFactory {
@@ -96,5 +96,5 @@ index a850a9634..59942d9cb 100644
          return event;
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0180-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0179-Prevent-Pathfinding-out-of-World-Border.patch
index 4667ab0441..774907924c 100644
--- a/Spigot-Server-Patches/0180-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0179-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 7292ba902909ac5284a165b4fc2c422bf503486a Mon Sep 17 00:00:00 2001
+From 707e8ba0eb6ac3a183cf727f1c4d50f260bf8202 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -39,5 +39,5 @@ index 9038d52eb..632eb1c9d 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0181-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0180-Bound-Treasure-Maps-to-World-Border.patch
index 93f820f634..e0e8211541 100644
--- a/Spigot-Server-Patches/0181-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0180-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From f9f30f2f2feec4b29dfe090139d5eef6fac615ec Mon Sep 17 00:00:00 2001
+From 45d3e0ca5f29f36d42f5accd1002ef28e8154f4c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -48,5 +48,5 @@ index 632eb1c9d..1bb172bbf 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0182-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0181-Configurable-Cartographer-Treasure-Maps.patch
index 029d29890b..582d0eb35d 100644
--- a/Spigot-Server-Patches/0182-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0181-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 3f73beb3e92deb8c057e8c9051d26dd342dc184b Mon Sep 17 00:00:00 2001
+From 19688088dfd7942c87b2edf2d023023ce5779d42 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -42,5 +42,5 @@ index 4ad75468c..ac6e2a9aa 100644
              if (blockposition != null) {
                  ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0183-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch
index 46ad1e891d..db9d36cf21 100644
--- a/Spigot-Server-Patches/0183-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0182-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From b44bf1c80442b336a199ef736c5e055c6aa9a763 Mon Sep 17 00:00:00 2001
+From edad739b97db0413196220e110ae87f18f782a13 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -27,5 +27,5 @@ index aca63be53..548da18e0 100644
      public static void a(DataConverterManager dataconvertermanager) {
          dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0184-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 14a84e3063..5fb2fb3269 100644
--- a/Spigot-Server-Patches/0184-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0183-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,4 +1,4 @@
-From 4b84f76c9cb64b655951120ee73e732bcb545d00 Mon Sep 17 00:00:00 2001
+From 7fba4ae4accab404b762be87d632d645c9b067c0 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
@@ -50,5 +50,5 @@ index 2b66a08ad..8a06cb165 100644
 +    }
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 55a45627a9..e0856ef943 100644
--- a/Spigot-Server-Patches/0185-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0184-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 7f5079d03bd22c1497fe715871a55339268944ec Mon Sep 17 00:00:00 2001
+From 46d75afb644e494d0ca3527f0eb81c7ab7cfea93 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -31,5 +31,5 @@ index 7af76e14c..2028cf81e 100644
  
              for (int i = 0; i < list.size(); ++i) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0186-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0185-Add-option-to-remove-invalid-statistics.patch
index 888518a87e..0d3a179c79 100644
--- a/Spigot-Server-Patches/0186-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0185-Add-option-to-remove-invalid-statistics.patch
@@ -1,14 +1,14 @@
-From bde76955ebf689676626f9556eb9fdcfb14a4062 Mon Sep 17 00:00:00 2001
+From feb9583705667c98cf1be70c3c4e42a062b96ce8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 009bf0c8b..a901cd85c 100644
+index db2a4c2c7..e936264c5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -261,4 +261,13 @@ public class PaperConfig {
+@@ -256,4 +256,13 @@ public class PaperConfig {
      private static void playerAutoSaveRate() {
          playerAutoSaveRate = getInt("settings.player-auto-save-rate", -1);
      }
@@ -53,5 +53,5 @@ index 99466dbde..d1bee0257 100644
          }
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0187-IllegalPacketEvent.patch b/Spigot-Server-Patches/0186-IllegalPacketEvent.patch
index bfed8f8061..5c439cf905 100644
--- a/Spigot-Server-Patches/0187-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0186-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 4fc99496df25951ad23dbc3826251451b0b3648b Mon Sep 17 00:00:00 2001
+From d9570be2a290ff85ba97c0239f95fdaccc56d587 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -67,5 +67,5 @@ index 51d27351d..437575003 100644
                      }
                      // CraftBukkit start
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0188-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch
index 594531a444..2fc7b2db72 100644
--- a/Spigot-Server-Patches/0188-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0187-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 77f94e63e14562ee3fd6baee250aa08629d20294 Mon Sep 17 00:00:00 2001
+From b5ff4a771525c095c857990c97460b06d81f2b4e Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -31,5 +31,5 @@ index 437575003..7c2d43ac2 100644
      }
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0189-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
index 29845d6170..57686181b7 100644
--- a/Spigot-Server-Patches/0189-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0188-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From e3751676733cbb710d6a2bb4bea2352b06268c0e Mon Sep 17 00:00:00 2001
+From fae815991d4346aba2ebd7615b6038aa39048961 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@@ -85,5 +85,5 @@ index 61c32223d..072b59125 100644
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
          packet.header = header;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0190-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0189-Activation-Range-Improvements.patch
index 8c6610ff72..54ff52e728 100644
--- a/Spigot-Server-Patches/0190-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0189-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 2fdcf26f32ce8995e73577b04c3fa62daed47b0b Mon Sep 17 00:00:00 2001
+From ece09938de2d54fdb086c03f4e266db8e5bfa191 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -155,5 +155,5 @@ index c8a6ff3d4..428912cbc 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0191-Firework-API-s.patch b/Spigot-Server-Patches/0190-Firework-API-s.patch
index ca0d8523f0..019ef30435 100644
--- a/Spigot-Server-Patches/0191-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0190-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From 77cab89358556aee79c19fc27856885bcc29174b Mon Sep 17 00:00:00 2001
+From 1782bd7ccc4654e2402a73990ec26b47e58c1faf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
@@ -129,5 +129,5 @@ index 99746b3c2..d4fbe31d6 100644
 +    // Paper end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0192-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0191-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
index 0655c4c429..a9dcd6b0af 100644
--- a/Spigot-Server-Patches/0192-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
+++ b/Spigot-Server-Patches/0191-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
@@ -1,4 +1,4 @@
-From 2c39eddf8fae574d0799de86543aee218c5de0c2 Mon Sep 17 00:00:00 2001
+From cc1f75b2bba9893a74cbb47ccf06f69a3b7b304c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 29 Dec 2016 00:56:51 -0500
 Subject: [PATCH] Change Outdated Build Download URL to Paper CI
@@ -18,5 +18,5 @@ index 59d4e2e6f..e4ec213e4 100644
                          Thread.sleep(TimeUnit.SECONDS.toMillis(15));
                      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0193-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0192-PlayerTeleportEndGatewayEvent.patch
index 81f78a9811..d790121e1e 100644
--- a/Spigot-Server-Patches/0193-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0192-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 2bdc6f5272c0edc55981f9be27551637da1cd57b Mon Sep 17 00:00:00 2001
+From 5ee9d8161b863c2c9885a8cea9b5040eee7ba615 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -19,5 +19,5 @@ index 065d0bbfc..ea8992d72 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0194-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/0193-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
index b477751f80..966d95f596 100644
--- a/Spigot-Server-Patches/0194-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
+++ b/Spigot-Server-Patches/0193-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch
@@ -1,4 +1,4 @@
-From c4db7822f7900b67d446e850eddc5c1072189c43 Mon Sep 17 00:00:00 2001
+From ce7f24eb9d636fa03187f7702aa92477144b4856 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 2 Jan 2017 02:07:24 -0500
 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets
@@ -24,5 +24,5 @@ index 7c2d43ac2..cbe5d36d0 100644
                              } else {
                                  containeranvil.a("");
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0195-MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/0194-MC-112017-Allow-31-instead-of-30-for-item-names.patch
index 298b6f374a..be3a240615 100644
--- a/Spigot-Server-Patches/0195-MC-112017-Allow-31-instead-of-30-for-item-names.patch
+++ b/Spigot-Server-Patches/0194-MC-112017-Allow-31-instead-of-30-for-item-names.patch
@@ -1,4 +1,4 @@
-From 598f7eb64194ea079dd66291a32f825ed4e790e4 Mon Sep 17 00:00:00 2001
+From 2ec00efd9cad44ca32949b15a31657c0a399e56a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 2 Jan 2017 02:43:22 -0500
 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
@@ -18,5 +18,5 @@ index cbe5d36d0..70af4ebbb 100644
                                  }
                              } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0196-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0195-ShulkerBox-Dupe-Prevention.patch
index de6d5c1b9c..105814de5a 100644
--- a/Spigot-Server-Patches/0196-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0195-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From b8d59828da1c0c02e2c8bbd465097280823dca75 Mon Sep 17 00:00:00 2001
+From 734e63826e99e2f419b7658200efa0200fb7fc7f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -19,5 +19,5 @@ index fcb1a6c66..12fb81635 100644
  
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0197-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0196-Provide-E-TE-Chunk-count-stat-methods.patch
index 94854a7ecd..351e106193 100644
--- a/Spigot-Server-Patches/0197-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0196-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 02c793d3104d8e5020e4a3a52f84ff4dcedc7cb3 Mon Sep 17 00:00:00 2001
+From afb3ac542cfec82549caa96fcc3dfccacf438cc8 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -41,5 +41,5 @@ index 3f8859a1f..b42074706 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0198-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0197-Enforce-Sync-Player-Saves.patch
index ae74e6baa7..068576f0e6 100644
--- a/Spigot-Server-Patches/0198-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0197-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 99d5619fef40baa566b55e9b3502d44a39ad3bf0 Mon Sep 17 00:00:00 2001
+From 5c5c9996f55ce482651fc8040a0c2dac74c855fb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -27,5 +27,5 @@ index 58f30fb1d..034bdb7cf 100644
      // Paper end
  
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0199-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0198-Enforce-Sync-Chunk-Unloads.patch
index 5dd16ec3a0..11a2ad60a9 100644
--- a/Spigot-Server-Patches/0199-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0198-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 99af5e5c170122720f987589ca7d0102dda88197 Mon Sep 17 00:00:00 2001
+From b4feab297b843a3dc57696fb729ae04be178ae1b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -27,5 +27,5 @@ index b42074706..b837a921c 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0200-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0199-Don-t-allow-entities-to-ride-themselves-572.patch
index 85a14cd9fe..b83681702e 100644
--- a/Spigot-Server-Patches/0200-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0199-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,4 +1,4 @@
-From 760288d1cb35ce28612916f1fe13f03a80ea8b73 Mon Sep 17 00:00:00 2001
+From 67d9588c6d98e7b5778165506b5cc23dea4458d5 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
@@ -17,5 +17,5 @@ index 1e295432e..6fcced926 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0201-Fix-block-break-desync.patch b/Spigot-Server-Patches/0200-Fix-block-break-desync.patch
index 2c441cefae..6237f54e61 100644
--- a/Spigot-Server-Patches/0201-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0200-Fix-block-break-desync.patch
@@ -1,4 +1,4 @@
-From b3d90b43866f0dbc59b6f35d3e0223776d228fb7 Mon Sep 17 00:00:00 2001
+From a95785c0f55d02b60c044ddf89ac3c59e68c8c1f Mon Sep 17 00:00:00 2001
 From: Michael Himing <[email protected]>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
@@ -17,5 +17,5 @@ index 70af4ebbb..0e2f43b96 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0202-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0201-Assign-the-World-in-WorldGenStronghold.patch
index 01d84ab7c8..42f28093a2 100644
--- a/Spigot-Server-Patches/0202-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0201-Assign-the-World-in-WorldGenStronghold.patch
@@ -1,4 +1,4 @@
-From d87b02439ca632436aa045cadb984c0274c866c1 Mon Sep 17 00:00:00 2001
+From b1ccee575e8f9add6c6291635bd8448320047218 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 14 Jan 2017 01:22:07 -0600
 Subject: [PATCH] Assign the World in WorldGenStronghold
@@ -17,5 +17,5 @@ index c93754704..a3b958e01 100644
              this.c();
              this.b = true;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0203-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0202-Add-fromBottle-flag-to-Experience-Orbs.patch
index 28c13b3003..e5ea9fa2b0 100644
--- a/Spigot-Server-Patches/0203-Add-fromBottle-flag-to-Experience-Orbs.patch
+++ b/Spigot-Server-Patches/0202-Add-fromBottle-flag-to-Experience-Orbs.patch
@@ -1,4 +1,4 @@
-From a35b6a34e34c3e3ae1117ff6bef65b22385b8d5b Mon Sep 17 00:00:00 2001
+From 4c1854850ad87d0ed98b9d8928f34dc9f0e6b80d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sat, 14 Jan 2017 16:15:26 -0600
 Subject: [PATCH] Add fromBottle flag to Experience Orbs
@@ -68,5 +68,5 @@ index 3a09cab3d..61e3c6c3e 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0204-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0203-Remove-the-Vanilla-Method-Profiler.patch
index 1efc2bdca9..a59ca26db4 100644
--- a/Spigot-Server-Patches/0204-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0203-Remove-the-Vanilla-Method-Profiler.patch
@@ -1,4 +1,4 @@
-From c7306a084e0db72c5ecf0bae8d8463c69826e7f9 Mon Sep 17 00:00:00 2001
+From cc3ecd92e74492a59cfe82650919b1217fc5d4c9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 21 Jan 2017 02:00:33 -0500
 Subject: [PATCH] Remove the Vanilla Method Profiler
@@ -79,5 +79,5 @@ index 654652916..276983485 100644
 +    }
 +}
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0205-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0204-Cap-Entity-Collisions.patch
index f5d390b9c6..97e6f5e09e 100644
--- a/Spigot-Server-Patches/0205-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0204-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 3c00d6376d7fc8505bce90568180af8da00e2c13 Mon Sep 17 00:00:00 2001
+From 17c4817e7cc69541d08fa475e712265fd57e9447 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -56,5 +56,5 @@ index 7242da9cc..53486e205 100644
                  this.C(entity);
              }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0206-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0205-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index d0447c4f8f..d703de1e06 100644
--- a/Spigot-Server-Patches/0206-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0205-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -1,4 +1,4 @@
-From 2ee2dc9a86f49234475babaaedbe77a8e738e1a5 Mon Sep 17 00:00:00 2001
+From 08049c0273581d742ce6a120fd981a675e2c2c1f Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 23 Jan 2017 15:10:25 -0600
 Subject: [PATCH] Do not allow a zero max height in BiomeJungle
@@ -34,5 +34,5 @@ index 6a0b3a62d..38a7af58c 100644
          return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
      }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0207-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0206-Remove-CraftScheduler-Async-Task-Debugger.patch
index e4d9028f28..552213109d 100644
--- a/Spigot-Server-Patches/0207-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0206-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From bc4620bc17988c0b738d7a19641dff1a42f38458 Mon Sep 17 00:00:00 2001
+From 54c4e8f381c1ff582e949fabafbdec7a9dc9498f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -58,5 +58,5 @@ index e30cfb7b7..448c27cc7 100644
  
      @Deprecated
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0208-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0207-Shame-on-you-Mojang.patch
index a4af73cbb9..a1abfa42d8 100644
--- a/Spigot-Server-Patches/0208-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0207-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 5659da37e2d30e64da7f749817355ad96899a4a8 Mon Sep 17 00:00:00 2001
+From 8fc486b100aea685edf375ee4071d2e9107ff13b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@@ -55,5 +55,5 @@ index f44f05620..74c371179 100644
      }
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0209-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0208-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 66407fb849..58e46f48dc 100644
--- a/Spigot-Server-Patches/0209-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0208-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From 4781c61848dc79486a9eb366c01b27c40c26a15b Mon Sep 17 00:00:00 2001
+From a96e1d9ecd19d5c45174301b0278befb09512587 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
@@ -18,5 +18,5 @@ index dabe4137f..fb4f11958 100644
  
                  Iterator iterator = this.unloadQueue.iterator();
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0210-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0209-Do-not-let-armorstands-drown.patch
index 535d0070da..ca9770eda3 100644
--- a/Spigot-Server-Patches/0210-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0209-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From e3e92ddb40f19cb76fd012b57ad8388526bc5972 Mon Sep 17 00:00:00 2001
+From 52ff66fa79ab7f39930fe8b1ed0ff601c409b391 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
@@ -41,5 +41,5 @@ index 53486e205..9b7159450 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0211-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0210-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
index 1e1f885743..0700eaa290 100644
--- a/Spigot-Server-Patches/0211-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/0210-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@@ -1,4 +1,4 @@
-From 409d9321d3f2a0e641c01c82db43c5c0c719f3dc Mon Sep 17 00:00:00 2001
+From 67c74ec6cf8e9187f0c9a4cca1d976f448e2bc2b Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Sun, 9 Apr 2017 23:50:15 -0700
 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
@@ -19,5 +19,5 @@ index 548da18e0..29902769f 100644
          // CraftBukkit start - Route through setData for filtering
          // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0212-Raise-book-max-title-length-to-32.patch b/Spigot-Server-Patches/0212-Raise-book-max-title-length-to-32.patch
deleted file mode 100644
index 6f929357ee..0000000000
--- a/Spigot-Server-Patches/0212-Raise-book-max-title-length-to-32.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 83fd1a178278b176c9cebc5a898212e01b977c27 Mon Sep 17 00:00:00 2001
-From: Zach Brown <[email protected]>
-Date: Sat, 29 Apr 2017 20:41:58 -0500
-Subject: [PATCH] Raise book max title length to 32
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index dfeeb54e6..0c7ae36b4 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -36,7 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
-     static final ItemMetaKey GENERATION = new ItemMetaKey("generation");
-     static final int MAX_PAGES = 50;
-     static final int MAX_PAGE_LENGTH = 256;
--    static final int MAX_TITLE_LENGTH = 16;
-+    static final int MAX_TITLE_LENGTH = 32; // Paper
- 
-     protected String title;
-     protected String author;
--- 
-2.12.2.windows.2
-
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 7861de61e648464ce3e3dd635ed19f92521fc95
+Subproject 7450a0255b79a2a4675d31946ebda8716394bbe
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject a2af8f0a730c11af84d995ccfcf36544ddb4eea
+Subproject 2b6c9f40aef19b5366a8ecd6bf2bb9900ce3c68
diff --git a/work/Spigot b/work/Spigot
-Subproject a3f6ea510b919b8d64636ed6be3b7b23af9e6b1
+Subproject 3fb9445eca2b29aaae34bf5723cfd8da3fc1bf1