Fix the end credits toggle

I think its pretty clear that no one uses this given that it didn't work at all before
2016-03-16 02:21:39 -05:00 · 2016-03-16 02:21:39 -05:00 · 30f02fe6e5
Commit 30f02fe6e5
--- a/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch
+++ b/Spigot-Server-Patches/0010-Toggle-for-player-interact-limiter.patch
@ -1,4 +1,4 @@
-From 2edd7fbd40e36707d36c148b9cefa8458c9964f7 Mon Sep 17 00:00:00 2001
+From ce52d5924a508126ad400c493de30523f6eb535a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:31:05 -0600
 Subject: [PATCH] Toggle for player interact limiter
@ -22,10 +22,10 @@ index dca7763..0ffa733 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 99707f0..4795c44 100644
+index 39ba550..cbffd19 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -904,7 +904,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -912,7 +912,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
         this.player.resetIdleTimer();
         // Spigot start
         boolean throttled = false;
--- a/Spigot-Server-Patches/0032-Configurable-end-credits-when-leaving-the-end.patch
+++ b/Spigot-Server-Patches/0032-Configurable-end-credits-when-leaving-the-end.patch
@ -1,75 +0,0 @@
-From a069652a3ba0866cac4c632565af03258a99c17b Mon Sep 17 00:00:00 2001
-From: DoctorDark <doctordark11@gmail.com>
-Date: Wed, 2 Mar 2016 01:17:06 -0600
-Subject: [PATCH] Configurable end credits when leaving the end
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5504cfe..6dc7e4c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -163,4 +163,10 @@ public class PaperWorldConfig {
-         useAsyncLighting = false; //getBoolean( "use-async-lighting", false );
-         log("World async lighting: " + useAsyncLighting);
-     }
-+
-+    public boolean disableEndCredits;
-+    private void disableEndCredits() {
-+        disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
-+        log("End credits disabled: " + disableEndCredits);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2ec82a2..59ea36d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -525,9 +525,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
- 
-     public Entity c(int i) {
-         this.cj = true;
-+        // Paper start - Allow configurable end portal credits
-         if (this.dimension == 1 && i == 1) {
-            this.world.kill(this);
-            if (!this.viewingCredits) {
-+            if (!this.viewingCredits && !world.paperConfig.disableEndCredits) {
-+                this.world.kill(this);
-+                // Paper end
-                 this.viewingCredits = true;
-                 if (this.a(AchievementList.D)) {
-                     this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(4, 0.0F));
-@@ -545,7 +547,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             } else {
-                 this.b((Statistic) AchievementList.y);
-             }
-+        }
- 
-+        if (!(this.dimension == 1 && i == 1) || world.paperConfig.disableEndCredits) { // Paper - Allow configurable end portal credits
-             // CraftBukkit start
-             TeleportCause cause = (this.dimension == 1 || i == 1) ? TeleportCause.END_PORTAL : TeleportCause.NETHER_PORTAL;
-             this.server.getPlayerList().changeDimension(this, i, cause); // PAIL: check all this
-@@ -556,6 +560,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             this.cb = -1;
-             return this;
-         }
-+
-+        return null; // Paper - Theoretically it should never make it here
-     }
- 
-     public boolean a(EntityPlayer entityplayer) {
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 08faf3a..5517a2d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -729,7 +729,8 @@ public abstract class PlayerList {
-             return;
-         }
- 
-        exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo();
-+        // Paper - Configurable end credits, if a plugin sets to use a travel agent even if the cause is an end portal, ignore it
-+        exit = cause != TeleportCause.END_PORTAL && event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo();
-         if (exit == null) {
-             return;
-         }
-- 
-2.7.2
-
--- a/Spigot-Server-Patches/0032-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0032-Configurable-end-credits.patch
@ -0,0 +1,55 @@
+From f710e478cc89844a8a0f4718ba8bdf1189055143 Mon Sep 17 00:00:00 2001
+From: DoctorDark <doctordark11@gmail.com>
+Date: Wed, 16 Mar 2016 02:21:39 -0500
+Subject: [PATCH] Configurable end credits
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 5504cfe..6dc7e4c 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -163,4 +163,10 @@ public class PaperWorldConfig {
+         useAsyncLighting = false; //getBoolean( "use-async-lighting", false );
+         log("World async lighting: " + useAsyncLighting);
+     }
+
+    public boolean disableEndCredits;
+    private void disableEndCredits() {
+        disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
+        log("End credits disabled: " + disableEndCredits);
+    }
+ }
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index ff0939b..987164e 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -523,13 +523,25 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+         return this.world.pvpMode;
+     }
+ 
+    /**
+     * Paper - Give "theEnd2" achievement if the player doesn't already have it
+     */
+    private void giveTheEnd2() {
+        if (!this.a(AchievementList.D)) {
+            this.b(AchievementList.D);
+        }
+    }
+
+     public Entity c(int i) {
+         this.cj = true;
+         if (this.dimension == 1 && i == 1) {
+             this.world.kill(this);
+             if (!this.viewingCredits) {
+                 this.viewingCredits = true;
+-                if (this.a(AchievementList.D)) {
+                // Paper start - Allow configurable end portal credits
+                if (world.paperConfig.disableEndCredits || this.a(AchievementList.D)) {
+                    this.giveTheEnd2();
+                    // Paper end
+                     this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(4, 0.0F));
+                 } else {
+                     this.b((Statistic) AchievementList.D);
+-- 
+2.7.2
+
--- a/Spigot-Server-Patches/0033-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0033-Fix-lag-from-explosions-processing-dead-entities.patch
@ -1,4 +1,4 @@
-From cd20fd6624aa3ff40de2ce1e5219743c289bf2e7 Mon Sep 17 00:00:00 2001
+From 6a091a59b6cd632feb989692d91ebcf1e9cf751c Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
--- a/Spigot-Server-Patches/0034-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0034-Generator-Settings.patch
@ -1,11 +1,11 @@
-From 546984cc7a32e0532b0d9732b4c77a3332a4994e Mon Sep 17 00:00:00 2001
+From 4386e26de2f222ee1a34c1e93d01ec832d516e39 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e68595b..3cde5fd 100644
+index 6dc7e4c..a3fbe69 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -169,4 +169,28 @@ public class PaperWorldConfig {
--- a/Spigot-Server-Patches/0035-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0035-Optimize-explosions.patch
@ -1,4 +1,4 @@
-From 983be83bdbd9f5a39c09dd55eee555a6438dc434 Mon Sep 17 00:00:00 2001
+From eb19e5187fe8700b9c232ad829938129c1f5d4c8 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 74d22f7..d022513 100644
+index a3fbe69..138fc9c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -193,4 +193,10 @@ public class PaperWorldConfig {
@ -136,7 +136,7 @@ index db425fb..733f8e7 100644
 
             // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bbdfb3b..ee4642f 100644
+index 641d71f..de0a751 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -32,6 +32,7 @@ import org.bukkit.generator.ChunkGenerator;
--- a/Spigot-Server-Patches/0036-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0036-Stop-updating-flowing-block-if-material-has-changed.patch
@ -1,4 +1,4 @@
-From f78ee3cdf59990c2d828a298c6bf4c06bcd82dc0 Mon Sep 17 00:00:00 2001
+From 3becd04f9109592ab7c6f9c053e5790476a1e542 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
--- a/Spigot-Server-Patches/0037-Fast-draining.patch
+++ b/Spigot-Server-Patches/0037-Fast-draining.patch
@ -1,11 +1,11 @@
-From 60647fcd622bf436128c3f5d98e953ec0530a013 Mon Sep 17 00:00:00 2001
+From 3287d25c2f738f9d2d1ca3c00508852732d3cf55 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d022513..269d373 100644
+index 138fc9c..d2ffd55 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -199,4 +199,11 @@ public class PaperWorldConfig {
--- a/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
@ -1,11 +1,11 @@
-From 38052c7fb6cc2f5ee6bd889f908747a44b99f400 Mon Sep 17 00:00:00 2001
+From 925bdb7907d19b956e9c7cf3bcf4663f8a2fc2da Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dad5a95..72f1000 100644
+index d2ffd55..1c8e310 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -206,4 +206,11 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index dad5a95..72f1000 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 141765e..2ca998b 100644
+index 517c1e8..51b80cb 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -279,6 +279,9 @@ public class BlockFlowing extends BlockFluids {
--- a/Spigot-Server-Patches/0039-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0039-Add-player-view-distance-API.patch
@ -1,11 +1,11 @@
-From 58791be2a7a101b811e2c0dce46d0ec39720c5cd Mon Sep 17 00:00:00 2001
+From fb8cc16fde7343e4e275abd13e7764dd3b7e0f6f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 94b487c..3536c34 100644
+index 987164e..5b5d1ef 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -53,6 +53,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -88,7 +88,7 @@ index 8ef7eb2..5421026 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 972ead0..1a3c6d7 100644
+index fe9e452..4a5de6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1423,6 +1423,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
@ -1,4 +1,4 @@
-From 6fd6995aefe3c21191c4b2ac3f08200871ae5773 Mon Sep 17 00:00:00 2001
+From 42387eb4bbc045d276ba084d578cb3f5b41b8e84 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@ -19,7 +19,7 @@ index 1c8e310..694b448 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 89b2eb0..8c8fc38 100644
+index b864c5a..f3fdd4c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -853,12 +853,14 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0041-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0041-Disable-thunder.patch
@ -1,11 +1,11 @@
-From 93f794b1ca83d9f2f5fd6df068114e597a31defd Mon Sep 17 00:00:00 2001
+From b65215c6f3d7008143b5af416f3e9d4b22975c01 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6b5067a..b8262fc 100644
+index 694b448..889aaad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -218,4 +218,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index 6b5067a..b8262fc 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 14d92bb..36e4dab 100644
+index 8f37b97..2ef774c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -417,7 +417,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
--- a/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
@ -1,11 +1,11 @@
-From 2df4975985ef29a5bcd4710fdf9430ad856adb4e Mon Sep 17 00:00:00 2001
+From 4e200a7aae77a2396d684a3060fdc3a8822e32a0 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b8262fc..cd67b7d 100644
+index 889aaad..30117f7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -223,4 +223,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index b8262fc..cd67b7d 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 36e4dab..4c7a99f 100644
+index 2ef774c..c411f01 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -441,7 +441,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
--- a/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
@ -1,11 +1,11 @@
-From 10a3de48d2915d09a0b0401afa5bcfe9680d8f7f Mon Sep 17 00:00:00 2001
+From 10427ff3394de15b2ce46a01e09be9ccc0e6986c Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cd67b7d..ca71b03 100644
+index 30117f7..668bd78 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -228,4 +228,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index cd67b7d..ca71b03 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 917b626..98f0e07 100644
+index 2eee845..f4f77d7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -18,6 +18,7 @@ public abstract class MobSpawnerAbstract {
--- a/Spigot-Server-Patches/0044-Configurable-TNT-cannon-fix.patch
+++ b/Spigot-Server-Patches/0044-Configurable-TNT-cannon-fix.patch
@ -1,11 +1,11 @@
-From ce5b8ed7434fe0a2dcfc073f617b4479123602ed Mon Sep 17 00:00:00 2001
+From b8725fa29dc886377b3042ff03cd3ff590cd997c Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:00:53 -0600
 Subject: [PATCH] Configurable TNT cannon fix


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ca71b03..38d7dfc 100644
+index 668bd78..7102d7b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -233,4 +233,10 @@ public class PaperWorldConfig {
@ -187,7 +187,7 @@ index c1c0c7c..e2eb620 100644
                    world.getServer().getPluginManager().callEvent(event);
                 }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 500163b..5b6f300 100644
+index c44e493..51dda52 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -293,4 +293,22 @@ public class EntityFallingBlock extends Entity {
--- a/Spigot-Server-Patches/0045-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0045-Send-absolute-position-the-first-time-an-entity-is-s.patch
@ -1,4 +1,4 @@
-From 1bb4693646197a671146dc8d34a8275ac43d8308 Mon Sep 17 00:00:00 2001
+From ed74eec99de709a341951b574c4fe0f53c3b77d8 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
--- a/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch
@ -1,4 +1,4 @@
-From f4793135ffe14e9f962bd15dc4f60ce61eb2aca3 Mon Sep 17 00:00:00 2001
+From 7d6d6ae6378901555401aa1b5c8667fe447733e7 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
--- a/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
@ -1,11 +1,11 @@
-From d05593f669edf99cc8593a8a1149700bebd1c8b9 Mon Sep 17 00:00:00 2001
+From 601b345a7b4df9658baef232c406b3b0b7c1926c Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 38d7dfc..6ab8d0e 100644
+index 7102d7b..427e3b3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -239,4 +239,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index 38d7dfc..6ab8d0e 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8be847d..9e7c607 100644
+index 5b5d1ef..3902d4f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -54,6 +54,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--- a/Spigot-Server-Patches/0048-Fix-lava-water-some-times-creating-air-instead-of-co.patch
+++ b/Spigot-Server-Patches/0048-Fix-lava-water-some-times-creating-air-instead-of-co.patch
@ -1,4 +1,4 @@
-From c27f4a49443bdcc97e65def804bf401ce75d5612 Mon Sep 17 00:00:00 2001
+From 1765d2c06d538f20ef1efee89a7c28dc97cb1831 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:38:52 -0600
 Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone
--- a/Spigot-Server-Patches/0049-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0049-Use-UserCache-for-player-heads.patch
@ -1,4 +1,4 @@
-From aff65cb72004775ae5ed89ad16d4a761481aa23f Mon Sep 17 00:00:00 2001
+From f26a3e651b2b6e67203bf6e078d0f1f510c1965e Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
--- a/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
@ -1,11 +1,11 @@
-From 3fd336b993bb7f0a3c8ffcdca4c052f536b80a37 Mon Sep 17 00:00:00 2001
+From 37a692b0821ce1ff9f58741dceb38a0f18cc795b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 441d52e..c816b4d 100644
+index de0a751..1815f79 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1409,10 +1409,10 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/0051-Bump-thread-count-for-chunk-loading.patch
+++ b/Spigot-Server-Patches/0051-Bump-thread-count-for-chunk-loading.patch
@ -1,4 +1,4 @@
-From 07e14ab88a3b94f74a84552027c7398ac76de9ca Mon Sep 17 00:00:00 2001
+From 8ca16a403ce9416e0907f986bd35b2eca18dab53 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Bump thread count for chunk loading
--- a/Spigot-Server-Patches/0052-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
+++ b/Spigot-Server-Patches/0052-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch
@ -1,4 +1,4 @@
-From 4cd757e040deffa801cd18a673ab0960313e001a Mon Sep 17 00:00:00 2001
+From 35665a5704a486e4591e648db824b9b0ddbf6205 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
--- a/Spigot-Server-Patches/0053-Don-t-create-a-chunk-just-to-unload-it.patch
+++ b/Spigot-Server-Patches/0053-Don-t-create-a-chunk-just-to-unload-it.patch
@ -1,4 +1,4 @@
-From 68fa0ceea005bce4c5b6ec29ac6895b6d9ab6380 Mon Sep 17 00:00:00 2001
+From 39ecc8e9af0f15467844d39ef9065aad2d37ce3d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:55:20 -0600
 Subject: [PATCH] Don't create a chunk just to unload it
--- a/Spigot-Server-Patches/0054-EAR-Fix-bug-with-teleporting-entities.patch
+++ b/Spigot-Server-Patches/0054-EAR-Fix-bug-with-teleporting-entities.patch
@ -1,4 +1,4 @@
-From a7b8c6d02ae86f3bb6b1efae9c6527e21baf6921 Mon Sep 17 00:00:00 2001
+From cd4e4914b603747c1b023e083672e0584a34cd7e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:07:23 -0600
 Subject: [PATCH] EAR: Fix bug with teleporting entities
@ -7,7 +7,7 @@ Subject: [PATCH] EAR: Fix bug with teleporting entities
 https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/pull-requests/52/overview

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3af445b..429749a 100644
+index b3c29ca..cf58f74 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -118,9 +118,17 @@ public abstract class Entity implements ICommandListener {
--- a/Spigot-Server-Patches/0055-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0055-Add-PlayerInitialSpawnEvent.patch
@ -1,4 +1,4 @@
-From 631ba7666d943d5531c62edc2d50cffb9d2da96b Mon Sep 17 00:00:00 2001
+From 28db9382386acec7b1a627e85f9c047cd3593af3 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 38d20b7..1fb083b 100644
+index 08faf3a..344abbb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -99,6 +99,22 @@ public abstract class PlayerList {
--- a/Spigot-Server-Patches/0056-Process-Entity-Chunk-Registration-on-Teleport.patch
+++ b/Spigot-Server-Patches/0056-Process-Entity-Chunk-Registration-on-Teleport.patch
@ -1,4 +1,4 @@
-From 85da9e1e002a07a334b87d47c7d618e152204c8b Mon Sep 17 00:00:00 2001
+From cb3407e5a1d00eda5f97d2f12625ba0d418c93e9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:12:23 -0600
 Subject: [PATCH] Process Entity Chunk Registration on Teleport
--- a/Spigot-Server-Patches/0057-Timings-v2.patch
+++ b/Spigot-Server-Patches/0057-Timings-v2.patch
@ -1,4 +1,4 @@
-From cb7de95e68ead99f11e3bc71d3bf43415be8b1b8 Mon Sep 17 00:00:00 2001
+From 77ceef80ad43c8d082da0a1328659e0d9cbc3bcb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@ -290,7 +290,7 @@ index dd3abb8..a0186ef 100644
 import org.bukkit.craftbukkit.util.Waitable;
 import org.bukkit.event.server.RemoteServerCommandEvent;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6c1136..c2771e7 100644
+index cf58f74..38bc9c0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@ -329,7 +329,7 @@ index a6c1136..c2771e7 100644
 
     public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8c8fc38..03bc598 100644
+index f3fdd4c..d2f7cc2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -24,7 +24,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@ -461,10 +461,10 @@ index 733f8e7..92b98a0 100644
         // Run tasks that are waiting on processing
         SpigotTimings.processQueueTimer.startTiming(); // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9e5a037..5795804 100644
+index cbffd19..80ed7f8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
+@@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.util.NumberConversions;
@ -472,7 +472,7 @@ index 9e5a037..5795804 100644
 // CraftBukkit end
 
 public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1324,7 +1325,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1332,7 +1333,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
     // CraftBukkit end
 
    private void handleCommand(String s) {
@ -481,7 +481,7 @@ index 9e5a037..5795804 100644
        // CraftBukkit start - whole method
         if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
         this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1335,22 +1336,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1343,22 +1344,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
         this.server.getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
@ -637,7 +637,7 @@ index 1815f79..21b0986 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4c7a99f..66b7e77 100644
+index c411f01..0e1cbfe 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -241,13 +241,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
--- a/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch
@ -1,11 +1,11 @@
-From 42fb1b90f32ba15b2bc613d2002b3213de084d83 Mon Sep 17 00:00:00 2001
+From 40227e21c0661deeb3326ec2a40a72c8a6908ca0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6ab8d0e..d862fd9 100644
+index 427e3b3..6122760 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -244,4 +244,9 @@ public class PaperWorldConfig {
--- a/Spigot-Server-Patches/0059-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0059-Ensure-commands-are-not-ran-async.patch
@ -1,4 +1,4 @@
-From 9a7f7867636034d5b3cdf110b9131d88a0245b94 Mon Sep 17 00:00:00 2001
+From 4c48d661bf7df939a235d2008af4b473cfb86b39 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index caa404c..d141307 100644
+index 80ed7f8..27f78ab 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1257,6 +1257,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1265,6 +1265,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
         }
 
         if (!async && s.startsWith("/")) {
@ -82,5 +82,5 @@ index b27d95a..5a24d38 100644
             return true;
         }
 -- 
-2.7.2.windows.1
+2.7.2

--- a/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
@ -1,11 +1,11 @@
-From 2ccb13cae084aa30611c5c7a0398e4144217e129 Mon Sep 17 00:00:00 2001
+From 4a1f121939b07b19c79e15686da38a75a1e33182 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d862fd9..ed520d0 100644
+index 6122760..30c4a0f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -249,4 +249,9 @@ public class PaperWorldConfig {
--- a/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ b/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch
@ -1,4 +1,4 @@
-From 734508339ddb667db95298af5ae378926b99e2bc Mon Sep 17 00:00:00 2001
+From c3b0fc1874833d20cc33095420a4349f202b88a0 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@ -6,7 +6,7 @@ Subject: [PATCH] Add Location support to tab completers (vanilla feature


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ed520d0..50fc4a0 100644
+index 30c4a0f..99f072e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -254,4 +254,9 @@ public class PaperWorldConfig {
--- a/Spigot-Server-Patches/0062-Made-EntityDismountEvent-Cancellable.patch
+++ b/Spigot-Server-Patches/0062-Made-EntityDismountEvent-Cancellable.patch
@ -1,11 +1,11 @@
-From f86324be40eceb5194c1f58fafd0219fb538c8da Mon Sep 17 00:00:00 2001
+From 4e1268b8724257d5e429efa488898d14e9204881 Mon Sep 17 00:00:00 2001
 From: Nik Gil <nikmanG@users.noreply.github.com>
 Date: Thu, 3 Mar 2016 04:04:19 -0600
 Subject: [PATCH] Made EntityDismountEvent Cancellable


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b0aef4c..a6dde74 100644
+index 38bc9c0..ab718ce 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -38,6 +38,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@ -16,7 +16,7 @@ index b0aef4c..a6dde74 100644
 // CraftBukkit end
 
 public abstract class Entity implements ICommandListener {
-@@ -1735,6 +1736,11 @@ public abstract class Entity implements ICommandListener {
+@@ -1737,6 +1738,11 @@ public abstract class Entity implements ICommandListener {
             }
             // CraftBukkit end
             Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
--- a/Spigot-Server-Patches/0063-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0063-Optimize-Pathfinding.patch
@ -1,4 +1,4 @@
-From f0c6ad6334511ad4bc91aea310e08c72501d62aa Mon Sep 17 00:00:00 2001
+From 91c5270071363c7ecd1366749af6a052545ad1ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
--- a/Spigot-Server-Patches/0064-Optimize-getBlockData.patch
+++ b/Spigot-Server-Patches/0064-Optimize-getBlockData.patch
@ -1,4 +1,4 @@
-From 4f257ef83902bca1da8e046c6873c9cef158fdeb Mon Sep 17 00:00:00 2001
+From 1605c01b00947016970a88f124e76ee1a93fa1ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize getBlockData
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize getBlockData
 Hot method, so reduce # of instructions for the method.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3e9b26f..9369b69 100644
+index 5df38be..19788ed 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -392,8 +392,15 @@ public class Chunk {
--- a/Spigot-Server-Patches/0065-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0065-Avoid-hopper-searches-if-there-are-no-items.patch
@ -1,4 +1,4 @@
-From 845496e20e174f87fba207a48fe7b4993ad59dac Mon Sep 17 00:00:00 2001
+From f10417f375c81cec510a68204309474063d79aff Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9369b69..f0c464b 100644
+index 19788ed..6d148d7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -49,6 +49,10 @@ public class Chunk {
--- a/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch
@ -1,4 +1,4 @@
-From 871ec0828e63e11f2b69dfba6a1fb30c0591f7e5 Mon Sep 17 00:00:00 2001
+From 8fd763183a1bd1de2cebe68ef6a31a67bca01231 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
--- a/Spigot-Server-Patches/0067-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0067-Be-a-bit-more-informative-in-maxHealth-exception.patch
@ -1,11 +1,11 @@
-From 9b1dee4b1052c97a2da69e7879755b657661a126 Mon Sep 17 00:00:00 2001
+From 26480c5baebe4a6567d60581907652d49bf199aa Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 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 c17b614..5e1aec2 100644
+index ad3917d..6f25d18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -92,7 +92,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
--- a/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@ -1,4 +1,4 @@
-From 164d4efd8bef430906450337ea83a07ed3de97f2 Mon Sep 17 00:00:00 2001
+From 31b6e1bf9da0e6bd894023fc7ef1b062233c4061 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
--- a/Spigot-Server-Patches/0069-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0069-Player-Tab-List-and-Title-APIs.patch
@ -1,4 +1,4 @@
-From f8f6d2cf300230c54f07ed0ff7d90fe6f6a96f3d Mon Sep 17 00:00:00 2001
+From 5c9387d5adf82c863c02ba4dd4e4f1d733fe5213 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
--- a/Spigot-Server-Patches/0070-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0070-Ensure-inv-drag-is-in-bounds.patch
@ -1,4 +1,4 @@
-From 0ece26ab85eb8ce79e3b55e84087294022848cd3 Mon Sep 17 00:00:00 2001
+From 3d18173ece90994e98f666ca2a2d7cfc60165fbe Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
--- a/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch
@ -1,11 +1,11 @@
-From 6c700b5912800c45c936e752e85e717383d9ac43 Mon Sep 17 00:00:00 2001
+From 84b6a774a12374f05c0d1d02f2ca5e07f0fe40f3 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 938c05b..0066554 100644
+index 21b0986..2919415 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -33,6 +33,8 @@ import org.bukkit.generator.ChunkGenerator;
--- a/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch
@ -1,11 +1,11 @@
-From 339093668968143899beea3510d72e9e13889c80 Mon Sep 17 00:00:00 2001
+From 3508955e76e6d945f59e1c07eab3363916ee2359 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 50fc4a0..f42efe7 100644
+index 99f072e..0f74015 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -259,4 +259,9 @@ public class PaperWorldConfig {
--- a/Spigot-Server-Patches/0073-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0073-Add-velocity-warnings.patch
@ -1,4 +1,4 @@
-From 50d16f00aebd32ed2bf51b7ede8655df5f7eb78a Mon Sep 17 00:00:00 2001
+From 870093c01103414759a3fcc546329cc99d70746b Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
--- a/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch
@ -1,4 +1,4 @@
-From c38bb352f98246e32fc34760d79cadf64a5eab1a Mon Sep 17 00:00:00 2001
+From 951f6ae30c2192bd5a95efe4c386a3cda7e2ef03 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@ -11,7 +11,7 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
 The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f42efe7..c5c49bf 100644
+index 0f74015..f3b4288 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -264,4 +264,9 @@ public class PaperWorldConfig {
--- a/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From 1827b952562ca4c2f14709becc257b10d88be211 Mon Sep 17 00:00:00 2001
+From 153f8de5f5739122dd2c987cd1cdb32aa8c4e1d5 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@ -292,7 +292,7 @@ index 320e52e..d40257f 100644
             }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0066554..1db5334 100644
+index 2919415..d569f3b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@
--- a/Spigot-Server-Patches/0076-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0076-Speedup-BlockPos-by-fixing-inlining.patch
@ -1,4 +1,4 @@
-From fdfdc3dab2a765b9586a86a6551e244b1bc6aaa6 Mon Sep 17 00:00:00 2001
+From ca6e5670f428fcd927301216402c2e65715815b0 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 7 Mar 2016 12:51:01 -0700
 Subject: [PATCH] Speedup BlockPos by fixing inlining
--- a/Spigot-Server-Patches/0077-Optimize-Navigation-Listener.patch
+++ b/Spigot-Server-Patches/0077-Optimize-Navigation-Listener.patch
@ -1,4 +1,4 @@
-From 8680d4ea4f4a3409433f75857a5f92a2b173d656 Mon Sep 17 00:00:00 2001
+From b5971e8a4cb89311fc6624431b159c526e8c343e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 19:13:54 -0500
 Subject: [PATCH] Optimize Navigation Listener
--- a/Spigot-Server-Patches/0078-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0078-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@ -1,4 +1,4 @@
-From 8b951fc6098c10ec700fc28360efc2fb7ae7f233 Mon Sep 17 00:00:00 2001
+From af2e610ee6d63769448b95cc2386e9bf73beb02d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
--- a/Spigot-Server-Patches/0079-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0079-Disable-Scoreboards-for-non-players-by-default.patch
@ -1,4 +1,4 @@
-From 7212983f1d0fec1e4483dab4a9e37073560b5f38 Mon Sep 17 00:00:00 2001
+From 61f697e3c5f65691e9a451bb1245c0b8d03883f6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@ -37,10 +37,10 @@ index 871535c..25950bd 100644
 
                         if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 164722b..494b82b 100644
+index ab718ce..c28cf58 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1844,6 +1844,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1846,6 +1846,7 @@ public abstract class Entity implements ICommandListener {
     }
 
     public ScoreboardTeamBase aO() {
--- a/Spigot-Server-Patches/0080-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0080-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,11 +1,11 @@
-From 8afe21b2c6cf6f93d4e275410e893a88d243688e Mon Sep 17 00:00:00 2001
+From fe207a679722e373b467c738106f8a5566bb9b8c Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 03bc598..b262dc8 100644
+index d2f7cc2..e5d1fe0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1265,10 +1265,12 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0081-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0081-Complete-resource-pack-API.patch
@ -1,4 +1,4 @@
-From a38e6329573c936add21981f1afe62db94b47d59 Mon Sep 17 00:00:00 2001
+From 6894cfddcaf208b675684d39f80fa314867c10aa Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
@ -18,10 +18,10 @@ index 30ca225..148141d 100644
 
     public PacketPlayInResourcePackStatus() {}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d141307..d58f05b 100644
+index 27f78ab..1b16b54 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1018,7 +1018,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1026,7 +1026,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
 
     // CraftBukkit start
     public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
--- a/Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch
+++ b/Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch
@ -1,4 +1,4 @@
-From c69bda93df37e18b4d1f399e72831864ec9dc011 Mon Sep 17 00:00:00 2001
+From 60830bb985ae3fb37b5918b52bbccea28eb80958 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature
@ -19,7 +19,7 @@ index c47de89..56e513e 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 4cd2caa..ffe0395 100644
+index 4cd2caa..6406bed 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -178,6 +178,12 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
--- a/Spigot-Server-Patches/0083-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0083-Chunk-save-queue-improvements.patch
@ -1,4 +1,4 @@
-From fc24c303721e53eba7a36079e7b937bd3b7a692e Mon Sep 17 00:00:00 2001
+From 2d2446c8e66b71c2101f78d0d42701c03952fcf9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements