Remove the Improved Ping Sending patch

2014-03-26 20:34:47 +00:00 · 2014-03-26 20:34:47 +00:00 · 152e14cadc
commit 152e14cadc
parent fdfc07bd39
100 changed files with 235 additions and 286 deletions
--- a/CraftBukkit-Patches/0024-Enable-Improved-Ping-Sending.patch
+++ b/CraftBukkit-Patches/0024-Enable-Improved-Ping-Sending.patch
@ -1,51 +0,0 @@
-From dbc277885ec999d8e9ea208555b85b0e4baa34c1 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 24 Feb 2013 20:45:20 +1100
-Subject: [PATCH] Enable Improved Ping Sending
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8d98a70..4c06a42 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     public boolean keepLevel = false;
-     public double maxHealthCache;
-     public boolean joining = true;
-+    public int lastPing = -1; // Spigot
-     // CraftBukkit end
- 
-     public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5b0590e..273439a 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -779,6 +779,25 @@ public abstract class PlayerList {
-             this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
-         }
-         // CraftBukkit end */
-+        // Spigot start
-+        if ( !players.isEmpty() )
-+        {
-+            int index = Math.abs( MinecraftServer.currentTick ) % this.players.size();
-+            EntityPlayer player = (EntityPlayer) this.players.get( index );
-+            if ( player.lastPing == -1 || Math.abs( player.ping - player.lastPing ) > 20 )
-+            {
-+                Packet packet = new PacketPlayOutPlayerInfo( player.listName, true, player.ping );
-+                for ( EntityPlayer splayer : (List<EntityPlayer>) this.players )
-+                {
-+                    if ( splayer.getBukkitEntity().canSee( player.getBukkitEntity() ) )
-+                    {
-+                        splayer.playerConnection.sendPacket( packet );
-+                    }
-+                }
-+                player.lastPing = player.ping;
-+            }
-+        }
-+        // Spigot end
-     }
- 
-     public void sendAll(Packet packet) {
-- 
-1.8.5.2.msysgit.0
-
--- a/CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0024-Thread-Naming-and-Tweaks.patch
@ -1,4 +1,4 @@
-From 989b6eb61364f84235201eeba8e6530b04cd957d Mon Sep 17 00:00:00 2001
+From 97aff802848009171de09dfe1743942f7e803ba7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
@ -19,5 +19,5 @@ index 84dcfcc..a30f217 100644
     private CraftAsyncDebugger debugTail = debugHead;
     private static final int RECENT_TICKS;
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch
+++ b/CraftBukkit-Patches/0025-Close-Unloaded-Save-Files.patch
@ -1,4 +1,4 @@
-From eed8542d3e773f54d133cafe8170190d428e03f1 Mon Sep 17 00:00:00 2001
+From ac2b8d682a0e26e91eb7bb5ff65d794dd2816310 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files
--- a/CraftBukkit-Patches/0026-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0026-Remove-o-Option.patch
@ -1,4 +1,4 @@
-From 0d7baac82b5fcb65c088dcc8d094a65c709c1c2a Mon Sep 17 00:00:00 2001
+From 0a1e4d812ab47f41a9b54eb7bf34462c5427d1d1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 19 May 2013 18:29:48 +1000
 Subject: [PATCH] Remove -o Option
@ -19,5 +19,5 @@ index bb535c2..93968bd 100644
         }
 
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0027-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0027-Recipe-Deconstruction.patch
@ -1,4 +1,4 @@
-From a7301b6b770eacc5acc9a0d84ca2ec414668fae2 Mon Sep 17 00:00:00 2001
+From 0006f13d52fd4580961dcfba2367254d705bbfee Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 1 Jun 2013 16:34:38 +1000
 Subject: [PATCH] Recipe Deconstruction
@ -67,5 +67,5 @@ index 0fab83c..21181fb 100644
 +    // Spigot end
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0028-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0028-Implement-Arrow-API.patch
@ -1,11 +1,11 @@
-From 600bca74eebc7d90ec9c9e4e8424618ae498ae36 Mon Sep 17 00:00:00 2001
+From a47c3a4fd3cbb34d9f3ab7b0c6ba521430414081 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index 328c73f..839b88e 100644
+index 09e7223..8c8a173 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -75,6 +75,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
@ -27,5 +27,5 @@ index 328c73f..839b88e 100644
 
     public Arrow.Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0029-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0029-Hopper-Cooldowns.patch
@ -1,4 +1,4 @@
-From 01703d660a5e7114805f47fd40126f50d895e438 Mon Sep 17 00:00:00 2001
+From 58db53f2a0fc9262a36597cb24c19926af8b6cd8 Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Cooldowns
--- a/CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0030-Prevent-Shutdown-Hang.patch
@ -1,4 +1,4 @@
-From 2fb681c8b6ec9f26b4a3f43de21e39dc1b44e316 Mon Sep 17 00:00:00 2001
+From 4f70801d7449858686bdfd5628f871ab08c0e2bf Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang
 Prevents server hanging if players disconnect during the shutdown sequence.

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8b3d757..794bedd 100644
+index 5b0590e..1fb24f7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1129,8 +1129,15 @@ public abstract class PlayerList {
+@@ -1110,8 +1110,15 @@ public abstract class PlayerList {
     }
 
     public void r() {
@ -28,5 +28,5 @@ index 8b3d757..794bedd 100644
     }
 
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0031-Implement-SpawnerSpawnEvent.patch
@ -1,4 +1,4 @@
-From 7ccd533bb222ab768011597b908ee3184242a99d Mon Sep 17 00:00:00 2001
+From d1aee95f430bcaeee60611a01c201aba9ad1e303 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -6,7 +6,7 @@ Subject: [PATCH] Implement SpawnerSpawnEvent.
 Adds BUKKIT-267

 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 67c3397..bb6b3d5 100644
+index 06f9b1f..b97ac4b 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -5,7 +5,11 @@ import java.util.Collection;
@ -63,7 +63,7 @@ index 67c3397..bb6b3d5 100644
 
         return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a91ffb1..161506a 100644
+index 2911d60..c7e238f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -36,6 +36,7 @@ import org.bukkit.Statistic.Type;
@ -98,5 +98,5 @@ index a91ffb1..161506a 100644
      */
     public static PlayerBucketEmptyEvent callPlayerBucketEmptyEvent(EntityHuman who, int clickedX, int clickedY, int clickedZ, int clickedFace, ItemStack itemInHand) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0032-Firework-Meta-Crash-Fix.patch
@ -1,4 +1,4 @@
-From 6fd6fe221af342ea5ca043a5c2ff8f4122e5b5e4 Mon Sep 17 00:00:00 2001
+From b4c0a5523f7caf1cbbcbe3f85a282252616f8c47 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 15 Jun 2013 21:34:48 +1000
 Subject: [PATCH] Firework Meta Crash Fix
@ -27,5 +27,5 @@ index 0f7da6b..5a409ae 100644
     }
 
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0033-Do-Not-Search-for-Offline-Players.patch
+++ b/CraftBukkit-Patches/0033-Do-Not-Search-for-Offline-Players.patch
@ -1,4 +1,4 @@
-From f844d7a723829b91571c73c1fbe2f26aa2815a34 Mon Sep 17 00:00:00 2001
+From fbd77e9599476eb5e29bead4e0118c10e807344c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 16 Jun 2013 08:20:26 +1000
 Subject: [PATCH] Do Not Search for Offline Players
--- a/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0034-Allow-Disabling-of-Command-Logging.patch
@ -1,11 +1,11 @@
-From 0267e9dfadcdbca946f5b4e72ccd55c1aec8f691 Mon Sep 17 00:00:00 2001
+From 07ce333f9cd3b809183828c8c05908c3cdc87b53 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 22c75f9..ed28dbc 100644
+index 7d22cd5..3993f88 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -950,7 +950,12 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch
+++ b/CraftBukkit-Patches/0035-Allow-Disabling-of-Command-TabComplete.patch
@ -1,4 +1,4 @@
-From fce8bc23f6616f6facd4085435fc8abfecfecc0d Mon Sep 17 00:00:00 2001
+From 4def1ee6bc8092c8f5c5c291027254fa26422212 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
--- a/CraftBukkit-Patches/0036-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0036-Configurable-Messages.patch
@ -1,4 +1,4 @@
-From 19bcdf0bb0665520903b444611f8ea6ac1aeabe5 Mon Sep 17 00:00:00 2001
+From 6895473e668bcdae04e21e370345ce84942409f2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@ -23,7 +23,7 @@ index e5992f8..b80a760 100644
                 this.b.close(chatcomponenttext);
             } else {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 794bedd..461049e 100644
+index 1fb24f7..38c37c1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -339,7 +339,7 @@ public abstract class PlayerList {
@ -103,5 +103,5 @@ index 8764045..0ab2ec3 100644
 +    }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0037-Allow-Disabling-of-Random-Lighting-Updates.patch
@ -1,4 +1,4 @@
-From 14c0ba34a998a347295f5d340a007c12032a4e7d Mon Sep 17 00:00:00 2001
+From 68f23b95b10f7bc14e6f630dfa8ef2035cc53f53 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,7 +18,7 @@ index 0110120..96974b4 100644
         }
     }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a2ca914..8311844 100644
+index cb09320..7c66e3e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2035,7 +2035,7 @@ public abstract class World implements IBlockAccess {
--- a/CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
+++ b/CraftBukkit-Patches/0038-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch
@ -1,4 +1,4 @@
-From 0eba7ee76ad5e85588a62176a3d8125e1a3c6b1f Mon Sep 17 00:00:00 2001
+From edc5c05d89f5142dfd3f2b36aa92a5925f1d02d9 Mon Sep 17 00:00:00 2001
 From: Andre LeBlanc <andre@norcode.com>
 Date: Sat, 6 Apr 2013 12:00:31 -0400
 Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes
@ -53,5 +53,5 @@ index a91d81a..46a1d38 100644
         return getResultInventory().getSize() + getIngredientsInventory().getSize();
     }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0039-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0039-Properly-Close-Inventories.patch
@ -1,4 +1,4 @@
-From 7165eeb678b33e35a3e0fa682598a47ccbcfa4ca Mon Sep 17 00:00:00 2001
+From 7d837f713628487fec822f3af649caefcb566217 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2fd6a43..4473e7e 100644
+index 96974b4..3fc83e5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -760,6 +760,15 @@ public class Chunk {
@ -42,7 +42,7 @@ index 2fd6a43..4473e7e 100644
                 // Do not pass along players, as doing so can get them stuck outside of time.
                 // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 1d997e1..1c64d42 100644
+index 9f3f196..439cf2e 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
@@ -149,6 +149,12 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@ -59,5 +59,5 @@ index 1d997e1..1c64d42 100644
         super.b(i);
     }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0040-Disallow-Interaction-With-Self.patch
@ -1,11 +1,11 @@
-From 576164d98c3061031a24fddbdda055240a769897 Mon Sep 17 00:00:00 2001
+From 8d30529584f1e54814228d4d2ee15f88f227e721 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ed28dbc..6949979 100644
+index 3993f88..bc4ef27 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1057,6 +1057,13 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch
+++ b/CraftBukkit-Patches/0041-Lower-Chunk-Compression.patch
@ -1,4 +1,4 @@
-From 31d89c1e7d81fcd70a22b062b9f22a0e2ef15179 Mon Sep 17 00:00:00 2001
+From 965da8b168ac6b7cbb078dcc1ccfdd0a08d1bbb1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:07:54 +1000
 Subject: [PATCH] Lower Chunk Compression
@ -32,5 +32,5 @@ index 3eac231..bf3a139 100644
     };
     // CraftBukkit end
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0042-Entity-Mount-and-Dismount-Events.patch
@ -1,11 +1,11 @@
-From feff41762ea09e7227d8bb4561621a88321424b0 Mon Sep 17 00:00:00 2001
+From 84431675444ac8dbb0fa7ef947abeab61000e6b2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 43fee78..d8d5739 100644
+index 621f593..b13968d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1452,6 +1452,7 @@ public abstract class Entity {
@ -35,7 +35,7 @@ index 43fee78..d8d5739 100644
             if (this.vehicle != null) {
                 this.vehicle.passenger = null;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c12a08f..7442943 100644
+index 58b7b96..eaf823c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -323,6 +323,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@ -47,5 +47,5 @@ index c12a08f..7442943 100644
             Entity originalVehicle = this.vehicle;
             // First statement moved down, second statement handled in parent method.
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch
+++ b/CraftBukkit-Patches/0043-Prevent-Ghost-Players-Caused-by-Plugins.patch
@ -1,4 +1,4 @@
-From 670d2593f6ace36c0802b3f46add4a1adbbf7b4a Mon Sep 17 00:00:00 2001
+From cc3277adf3b3b503bd2a6c82d3318f73021ee54e Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
 Check if the player is still connected after firing event. Fixes BUKKIT-4327

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 461049e..a2599ec 100644
+index 38c37c1..385dc0a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -471,6 +471,11 @@ public abstract class PlayerList {
@ -22,5 +22,5 @@ index 461049e..a2599ec 100644
             location = respawnEvent.getRespawnLocation();
             entityplayer.reset();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch
+++ b/CraftBukkit-Patches/0044-Entity-ticking-chunk-caching.patch
@ -1,4 +1,4 @@
-From c1f0b16592ef1cbc634bd31b5ccb09204caf4396 Mon Sep 17 00:00:00 2001
+From 568c6c9068d74112aaae326208501a2dbd17ab82 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Tue, 16 Jul 2013 03:32:32 +0500
 Subject: [PATCH] Entity ticking chunk caching
@ -6,7 +6,7 @@ Subject: [PATCH] Entity ticking chunk caching
 Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8311844..835baf5 100644
+index 7c66e3e..cbb4e77 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1185,6 +1185,7 @@ public abstract class World implements IBlockAccess {
--- a/CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0045-Plug-World-Unload-Memory-Leak.patch
@ -1,4 +1,4 @@
-From 2798f4c21987ee36b27c8435bd29afa412146793 Mon Sep 17 00:00:00 2001
+From c9aaa508757d15762bce21ea1ad76380cb3e4392 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak
@ -18,5 +18,5 @@ index 8e01414..e0469bb 100644
     private boolean a(World world, int i, int j, int k, boolean flag) {
         if (!b.containsKey(world)) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0046-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0046-Player-Collision-API.patch
@ -1,11 +1,11 @@
-From b807256e061290c356ef0ea54f4e82797114a57f Mon Sep 17 00:00:00 2001
+From 46c4c10732506e3dfdff3bdc7303210050a0a003 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index bf20cad..6b20005 100644
+index eaf823c..a0f4dfc 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -430,7 +430,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@ -18,7 +18,7 @@ index bf20cad..6b20005 100644
                     Entity entity = (Entity) list.get(i);
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 57157ef..c04ff95 100644
+index 3758411..90c0e82 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1490,7 +1490,7 @@ public abstract class EntityLiving extends Entity {
@ -31,12 +31,12 @@ index 57157ef..c04ff95 100644
                 Entity entity = (Entity) list.get(i);
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4c06a42..994edde 100644
+index 8d98a70..d32a2d2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -64,6 +64,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -63,6 +63,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+     public double maxHealthCache;
     public boolean joining = true;
-     public int lastPing = -1; // Spigot
     // CraftBukkit end
 +    // Spigot start
 +    public boolean collidesWithEntities = true;
@ -57,7 +57,7 @@ index 4c06a42..994edde 100644
     public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
         super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 07c8a2c..296e20a 100644
+index b03037a..d251e79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1257,6 +1257,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0047-Fully-Disable-Snooper-When-Not-Required.patch
@ -1,4 +1,4 @@
-From d6dc3315938064c049a396ee9927e530128fbd3e Mon Sep 17 00:00:00 2001
+From 1855820fb449b50c6b508e4237d647419b3fb63b Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required
--- a/CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0048-Add-Getter-for-Entity-Invulnerability.patch
@ -1,4 +1,4 @@
-From e6e9d61786cc38e70aa1bb70d19cbe0d2676eaa6 Mon Sep 17 00:00:00 2001
+From fc84431ae09a739d56d194eca7545ba7e32c9372 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
@ -21,5 +21,5 @@ index e026c1f..96d763b 100644
 
     public Spigot spigot()
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0049-Cap-Minimum-Player-Speed.patch
@ -1,11 +1,11 @@
-From 28ef2cdb94058e48e2ed7fad2c34224e9fad1042 Mon Sep 17 00:00:00 2001
+From 21ecc7a983df97c214c0d2d90c1fc6c0739cc5bb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index afbc3d8..2a13ab2 100644
+index d251e79..6903d41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1129,7 +1129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -27,5 +27,5 @@ index afbc3d8..2a13ab2 100644
     }
 
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
+++ b/CraftBukkit-Patches/0050-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
@ -1,11 +1,11 @@
-From 53aeb97c002764d012a245aae52cd5771d706f7b Mon Sep 17 00:00:00 2001
+From 6f3da57934a1b289299a51da40674325e84cd1ea Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f034d30..c58b21b 100644
+index a0f4dfc..1f0e29a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -277,6 +277,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@ -20,5 +20,5 @@ index f034d30..c58b21b 100644
                 return;
             }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
+++ b/CraftBukkit-Patches/0051-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
@ -1,4 +1,4 @@
-From 86bd60d04387192040cab0800891c2e08bd28f40 Mon Sep 17 00:00:00 2001
+From ddf15651dc1bea839e545b638c3ef774317b7e6f Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Tue, 16 Jul 2013 22:34:50 +0200
 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
--- a/CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0052-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@ -1,11 +1,11 @@
-From 42e1cff41c516c789077c3a088326b9f6c0d5961 Mon Sep 17 00:00:00 2001
+From 1477f4d77a4847abd58f0ea17465436573080305 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving


 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 1eb87ae..b3c8101 100644
+index 97308d0..4d336d8 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -178,7 +178,15 @@ public abstract class StructureGenerator extends WorldGenBase {
@ -46,5 +46,5 @@ index adebd03..9586c44 100644
 +    }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0053-Item-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0053-Item-Despawn-Rate.patch
@ -1,4 +1,4 @@
-From 19123d8bf2c9f08c6b05a00832502c7d17814324 Mon Sep 17 00:00:00 2001
+From 8e173d2c9399b920630da34d9f159cbb1bfe9cd7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
--- a/CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0054-Don-t-Special-Case-X-Move-Value.patch
@ -1,11 +1,11 @@
-From c26229532d77b6504a398fd25e2a6c41721f4b42 Mon Sep 17 00:00:00 2001
+From e7f010f312b6dc26465c72c3b7f9dbc876fc199f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6949979..dd41222 100644
+index bc4ef27..1ea7e4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -105,6 +105,7 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0055-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0055-Implement-respawn-API.patch
@ -1,11 +1,11 @@
-From b79b05d49d9a71fc566f8d8de36b604395813867 Mon Sep 17 00:00:00 2001
+From 0ad400b8b6a6fc0e35b79f725fafc98c4aec1746 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 962880b..d5903b7 100644
+index 6903d41..48be84e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1270,6 +1270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch
+++ b/CraftBukkit-Patches/0056-Fix-BrewingStands-Removing-NBT-Potions.patch
@ -1,4 +1,4 @@
-From 7c354310c7a32a8125491de00ba888d4fb77d538 Mon Sep 17 00:00:00 2001
+From e8bc43ab4c173e204053dd90ffbe11417d1c7176 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 9 Oct 2013 18:20:05 +1100
 Subject: [PATCH] Fix BrewingStands Removing NBT / Potions
@ -24,5 +24,5 @@ index 3287d77..eabea5a 100644
                 }
             }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch
+++ b/CraftBukkit-Patches/0057-Arrow-Despawn-Rate.patch
@ -1,4 +1,4 @@
-From 94a7de9719a61ecadeb59c6825520552576b59b7 Mon Sep 17 00:00:00 2001
+From 9ca03fb0b1d7d7ea807a70a1c358862827d82a14 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
--- a/CraftBukkit-Patches/0058-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0058-Watchdog-Thread.patch
@ -1,4 +1,4 @@
-From 7ceb5bfffc00229347fb53fea2f20cae5f8bf04d Mon Sep 17 00:00:00 2001
+From 4930fa4aa556413371df3feef49b03b62bdd06dd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
@ -287,5 +287,5 @@ index 0000000..de08ad6
 +    }
 +}
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0059-Fix-packed-ice-generation.patch
+++ b/CraftBukkit-Patches/0059-Fix-packed-ice-generation.patch
@ -1,4 +1,4 @@
-From 6d0b7ad2704924b55543d02fa63143b219277bc5 Mon Sep 17 00:00:00 2001
+From d129581369e68f9fbfd0bd45a3de0d42d71d673e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 17:52:14 +1100
 Subject: [PATCH] Fix packed ice generation
@ -34,5 +34,5 @@ index c0db754..a830758 100644
                                 --k2;
                                 if (k2 <= 0) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0060-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0060-BungeeCord-Support.patch
@ -1,4 +1,4 @@
-From eaf48249ff3561debf47c07f8661150de7295caa Mon Sep 17 00:00:00 2001
+From a2f33e495dfbe8b2a4e97b0909cb56285cc7b75f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@ -85,7 +85,7 @@ index 9ff1694..f6cca80 100644
 +    // Spigot End
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5903b7..3b626be 100644
+index 48be84e..8b6e210 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1259,6 +1259,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/CraftBukkit-Patches/0061-Clear-Flower-Pot-on-Drop.patch
+++ b/CraftBukkit-Patches/0061-Clear-Flower-Pot-on-Drop.patch
@ -1,4 +1,4 @@
-From 12f40424d9f22422e3ccabdd0738611b07f1cd38 Mon Sep 17 00:00:00 2001
+From 084fa4da5aa714cbec570c3268a26cd1545e2dd8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop
--- a/CraftBukkit-Patches/0062-Fix-some-chunks-not-being-sent-to-the-client.patch
+++ b/CraftBukkit-Patches/0062-Fix-some-chunks-not-being-sent-to-the-client.patch
@ -1,11 +1,11 @@
-From ff1246063ef5c3c22f9fc8fa283f1177c365af28 Mon Sep 17 00:00:00 2001
+From 02e581fff0d1daa9931f52c8ed644ecef8054f3a Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client


 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4473e7e..51ebb7e 100644
+index 3fc83e5..3712009 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -930,7 +930,15 @@ public class Chunk {
@ -26,5 +26,5 @@ index 4473e7e..51ebb7e 100644
 
     public ChunkCoordIntPair l() {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0063-Fix-Broken-Async-Chat.patch
+++ b/CraftBukkit-Patches/0063-Fix-Broken-Async-Chat.patch
@ -1,4 +1,4 @@
-From 3a484bcfb8f98d55d73b30142783ae04e36aae03 Mon Sep 17 00:00:00 2001
+From 7b361009b21908c445791bc650eef71dcd35e468 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat
@ -36,5 +36,5 @@ index 604a7af..d419f0f 100644
     }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0064-Allow-Teleportation-of-Vehicles-and-Passengers.patch
+++ b/CraftBukkit-Patches/0064-Allow-Teleportation-of-Vehicles-and-Passengers.patch
@ -1,11 +1,11 @@
-From 5ef7f546dae98c26fa70a70ec99c71058abd76c6 Mon Sep 17 00:00:00 2001
+From efbd966c4bfc85a6f8444b284def2f23583f5d71 Mon Sep 17 00:00:00 2001
 From: ItsHarry <info@itsjerryandharry.com>
 Date: Thu, 5 Dec 2013 21:58:11 +0100
 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a85b08e..5fe8276 100644
+index 8b6e210..a2638bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -431,9 +431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -36,5 +36,5 @@ index a85b08e..5fe8276 100644
         // Update the From Location
         from = event.getFrom();
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0065-Remove-OS-X-Special-Chars-from-Signs.patch
+++ b/CraftBukkit-Patches/0065-Remove-OS-X-Special-Chars-from-Signs.patch
@ -1,11 +1,11 @@
-From 8c631bd49e4f40504eac06ba0a9efb15e71b43bb Mon Sep 17 00:00:00 2001
+From db1bb9c68c937ff426aa387951cea91ec97ba269 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 8 Dec 2013 16:52:42 +1100
 Subject: [PATCH] Remove OS X Special Chars from Signs


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 58e0e41..82ad68d 100644
+index 1ea7e4a..248d48e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1584,6 +1584,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -17,5 +17,5 @@ index 58e0e41..82ad68d 100644
                 if (packetplayinupdatesign.f()[j].length() > 15) {
                     flag = false;
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0066-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0066-Orebfuscator.patch
@ -1,4 +1,4 @@
-From 709f06163f0640d423ef0a76b7a045a1eb7aeda7 Mon Sep 17 00:00:00 2001
+From 843082121ed14c89160bebea30de24837bcc8f2b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@ -115,7 +115,7 @@ index 2db45ad..97fe53c 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 835baf5..7e2c574 100644
+index cbb4e77..106f27a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -470,6 +470,7 @@ public abstract class World implements IBlockAccess {
--- a/CraftBukkit-Patches/0067-Optimize-DataWatcher.patch
+++ b/CraftBukkit-Patches/0067-Optimize-DataWatcher.patch
@ -1,4 +1,4 @@
-From c38d1c9794ed32aa1b694db0f6f007dff173f5ee Mon Sep 17 00:00:00 2001
+From c05b40f1087cf9c762825ccf6c0e01e3d528bc9d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:45:47 +1100
 Subject: [PATCH] Optimize DataWatcher
@ -130,5 +130,5 @@ index 90a2a80..cca6bd9 100644
     }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0068-Allow-Disabling-Zombie-Villager-Aggression.patch
+++ b/CraftBukkit-Patches/0068-Allow-Disabling-Zombie-Villager-Aggression.patch
@ -1,4 +1,4 @@
-From 853278fac155fac09fa20c063d57dd482ad9b270 Mon Sep 17 00:00:00 2001
+From c06d0a4f26ee6c7790eca418f2a6127288c1ffcc Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression
--- a/CraftBukkit-Patches/0069-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0069-Configurable-Amount-of-Netty-Threads.patch
@ -1,4 +1,4 @@
-From 3fb9cd50fbf94768db176c008993ed705b40401f Mon Sep 17 00:00:00 2001
+From 81ea1a22b818c51332cbef69e883aaecaf2d0af8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads
--- a/CraftBukkit-Patches/0070-Prevent-Mineshaft-Saving.patch
+++ b/CraftBukkit-Patches/0070-Prevent-Mineshaft-Saving.patch
@ -1,11 +1,11 @@
-From faeab364acd5d8341cfd437c569151710fd84938 Mon Sep 17 00:00:00 2001
+From 93f9eba0f93d66a80285d823aea88e3ac1841237 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 15:21:02 +1100
 Subject: [PATCH] Prevent Mineshaft Saving


 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index b3c8101..2a6a571 100644
+index 4d336d8..f835b01 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -179,7 +179,7 @@ public abstract class StructureGenerator extends WorldGenBase {
@ -18,5 +18,5 @@ index b3c8101..2a6a571 100644
             this.e = (PersistentStructure) world.a(PersistentStructure.class, this.a());
             } else
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0071-Fire-PreLogin-Events-in-Offline-Mode.patch
+++ b/CraftBukkit-Patches/0071-Fire-PreLogin-Events-in-Offline-Mode.patch
@ -1,4 +1,4 @@
-From 1895a51bc8ae18591ad19bde12d5a6dbfc597d87 Mon Sep 17 00:00:00 2001
+From ad5d33ab46b0818fa710ab3a1bd9a9a471bc0f11 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode
--- a/CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0072-Log-Cause-of-Unexpected-Exceptions.patch
@ -1,4 +1,4 @@
-From b22dd330c76784f8a11abdca89a9c1f3be167d72 Mon Sep 17 00:00:00 2001
+From e637ee8322d20cde14d424d1440bfbc17bde7ef8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions
--- a/CraftBukkit-Patches/0073-Particle-API.patch
+++ b/CraftBukkit-Patches/0073-Particle-API.patch
@ -1,4 +1,4 @@
-From 5d9420f4c83ca2ce32ec429a54e3f37c3bdcc0e6 Mon Sep 17 00:00:00 2001
+From ec9455abc409d77b5d09d9359f4a2fd61451c88e Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@ -18,7 +18,7 @@ index 7de0de5..7eca388 100644
             datavalue = 0;
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 57dd4e7..948e81d 100644
+index bfa8c23..827ec16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -779,28 +779,18 @@ public class CraftWorld implements World {
@ -117,7 +117,7 @@ index 57dd4e7..948e81d 100644
 
     public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5fe8276..e6fce34 100644
+index a2638bc..03be384 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1292,6 +1292,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch
+++ b/CraftBukkit-Patches/0074-Fix-Biome-Decoration-Crashes.patch
@ -1,4 +1,4 @@
-From f5a4d4f8f4674def8b151a6fc3bee8a3b46bb20c Mon Sep 17 00:00:00 2001
+From 8968aef6fd4acaa86ca14d35171eb2009460f4d4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 5 Jan 2014 09:35:01 +1100
 Subject: [PATCH] Fix Biome Decoration Crashes
@ -107,5 +107,5 @@ index b048d6c..962d719 100644
 +    // Spigot End
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch
+++ b/CraftBukkit-Patches/0075-Save-ticks-lived-to-nbttag.patch
@ -1,11 +1,11 @@
-From c2b9cd210346b051c5dd59c2e3ff1c505b352622 Mon Sep 17 00:00:00 2001
+From 6a400f05f432135d7bf5c641d55f113c97b610f9 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d8d5739..5826b50 100644
+index b13968d..27b0a25 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1132,6 +1132,7 @@ public abstract class Entity {
@ -26,5 +26,5 @@ index d8d5739..5826b50 100644
                 if (entity instanceof EntityTameableAnimal && !isLevelAtLeast(nbttagcompound, 2) && !nbttagcompound.getBoolean("PersistenceRequired")) {
                     EntityInsentient entityinsentient = (EntityInsentient) entity;
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch
+++ b/CraftBukkit-Patches/0076-More-Efficient-GetCubes.patch
@ -1,11 +1,11 @@
-From 87af500446f76b4bfbe97c8254c5ac4601547b95 Mon Sep 17 00:00:00 2001
+From 2662f887e7f3478c01cc1835b493005bc7b820b6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:17:37 +1000
 Subject: [PATCH] More Efficient GetCubes


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7e2c574..b355d00 100644
+index 106f27a..a00075a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1050,23 +1050,42 @@ public abstract class World implements IBlockAccess {
--- a/CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
+++ b/CraftBukkit-Patches/0077-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
@ -1,4 +1,4 @@
-From ef4e63ebdb82d9d3bd57c6aab14b36cb1aef2810 Mon Sep 17 00:00:00 2001
+From c16a15827d53e1acb7f2b50a0c8df789891e137f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
@ -17,7 +17,7 @@ index 27b0a25..0ec07c2 100644
     // Spigot end
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index c8b6234..c8a4dc0 100644
+index 8c3c8f6..9350e86 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -417,6 +417,12 @@ public abstract class EntityInsentient extends EntityLiving {
--- a/CraftBukkit-Patches/0078-Warn-if-PermGen-may-be-insufficient.patch
+++ b/CraftBukkit-Patches/0078-Warn-if-PermGen-may-be-insufficient.patch
@ -1,4 +1,4 @@
-From 4f38a35da6cf609f852bae50e5b9102c21f71ddf Mon Sep 17 00:00:00 2001
+From dd0245ad9f6d9a89e1e904ca8052614e2c7f1716 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 14:07:41 +1100
 Subject: [PATCH] Warn if PermGen may be insufficient
@ -32,5 +32,5 @@ index 8d127fb..008e037 100644
                 MinecraftServer.main(options);
             } catch (Throwable t) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
+++ b/CraftBukkit-Patches/0079-Disable-Connected-Check-on-setScoreboard.patch
@ -1,11 +1,11 @@
-From 63c3cb8be33c7fdcc422e39338b7f8cca3ed58e4 Mon Sep 17 00:00:00 2001
+From f28a0094dc8fe9667f4896e2594e5e1b762e8956 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5fe8276..0e8fedf 100644
+index 03be384..3fcab5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1192,7 +1192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -18,5 +18,5 @@ index 5fe8276..0e8fedf 100644
 
         this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch
+++ b/CraftBukkit-Patches/0080-Add-Late-Bind-Option.patch
@ -1,4 +1,4 @@
-From b2a1a9e6f482c69b791f4a6d4dac0ef3f3504e89 Mon Sep 17 00:00:00 2001
+From 460a53367fb82ef314f3bc229c914d2cb2b3e690 Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option
--- a/CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
+++ b/CraftBukkit-Patches/0081-Update-Chest-Animation-when-Cancelling-Event.patch
@ -1,4 +1,4 @@
-From 0bcee56565bb69620125c4ec9c7938f395cc8c47 Mon Sep 17 00:00:00 2001
+From 898ed50fc7a54f6c3612f0d51f4bd2d9d410e700 Mon Sep 17 00:00:00 2001
 From: bloodshot <jdroque@gmail.com>
 Date: Mon, 6 Jan 2014 16:29:51 -0500
 Subject: [PATCH] Update Chest Animation when Cancelling Event
@ -13,10 +13,10 @@ More info can be found here
 https://bukkit.atlassian.net/browse/BUKKIT-1440

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 994edde..982a696 100644
+index d32a2d2..fda1e26 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -635,7 +635,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -634,7 +634,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerChest(this.inventory, iinventory));
@ -28,7 +28,7 @@ index 994edde..982a696 100644
         // CraftBukkit end
 
         this.nextContainerCounter();
-@@ -648,7 +651,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -647,7 +650,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public void openHopper(TileEntityHopper tileentityhopper) {
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, tileentityhopper));
@ -40,7 +40,7 @@ index 994edde..982a696 100644
         // CraftBukkit end
 
         this.nextContainerCounter();
-@@ -661,7 +667,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -660,7 +666,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public void openMinecartHopper(EntityMinecartHopper entityminecarthopper) {
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, entityminecarthopper));
@ -52,7 +52,7 @@ index 994edde..982a696 100644
         // CraftBukkit end
 
         this.nextContainerCounter();
-@@ -674,7 +683,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -673,7 +682,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public void openFurnace(TileEntityFurnace tileentityfurnace) {
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerFurnace(this.inventory, tileentityfurnace));
@ -64,7 +64,7 @@ index 994edde..982a696 100644
         // CraftBukkit end
 
         this.nextContainerCounter();
-@@ -687,7 +699,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -686,7 +698,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public void openDispenser(TileEntityDispenser tileentitydispenser) {
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerDispenser(this.inventory, tileentitydispenser));
@ -76,7 +76,7 @@ index 994edde..982a696 100644
         // CraftBukkit end
 
         this.nextContainerCounter();
-@@ -700,7 +715,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -699,7 +714,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public void openBrewingStand(TileEntityBrewingStand tileentitybrewingstand) {
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBrewingStand(this.inventory, tileentitybrewingstand));
@ -88,7 +88,7 @@ index 994edde..982a696 100644
         // CraftBukkit end
 
         this.nextContainerCounter();
-@@ -713,7 +731,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -712,7 +730,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public void openBeacon(TileEntityBeacon tileentitybeacon) {
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBeacon(this.inventory, tileentitybeacon));
@ -100,7 +100,7 @@ index 994edde..982a696 100644
         // CraftBukkit end
 
         this.nextContainerCounter();
-@@ -756,7 +777,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -755,7 +776,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public void openHorseInventory(EntityHorse entityhorse, IInventory iinventory) {
         // CraftBukkit start - Inventory open hook
         Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHorse(this.inventory, iinventory, entityhorse));
--- a/CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
+++ b/CraftBukkit-Patches/0082-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
@ -1,4 +1,4 @@
-From fc4c6eaf24846130adffb26e2da82dba90472b6b Mon Sep 17 00:00:00 2001
+From c802b1ee3ad985d70fe4036ef7d83fc705611159 Mon Sep 17 00:00:00 2001
 From: bloodshot <jdroque@gmail.com>
 Date: Mon, 6 Jan 2014 18:02:01 -0500
 Subject: [PATCH] Update Client's Hand when BlockPlaceEvent Cancelled
@ -16,7 +16,7 @@ PlayerConnection.a(handlePlace) not to send the appropriate packet to
 client which causes the bug.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 82ad68d..1b862fb 100644
+index 248d48e..28bf9d4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -638,7 +638,9 @@ public class PlayerConnection implements PacketPlayInListener {
@ -31,5 +31,5 @@ index 82ad68d..1b862fb 100644
 
             flag = true;
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0083-Allow-statistics-to-be-disabled-forced.patch
@ -1,4 +1,4 @@
-From d8d5882a6243d30cbc331101926fd05c55e43e68 Mon Sep 17 00:00:00 2001
+From 921e759228e5730b577004542b8a08f23bd40976 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 7 Jan 2014 15:56:26 +0000
 Subject: [PATCH] Allow statistics to be disabled/forced
--- a/CraftBukkit-Patches/0084-Fix-anvil-collisions.patch
+++ b/CraftBukkit-Patches/0084-Fix-anvil-collisions.patch
@ -1,4 +1,4 @@
-From 41c9f74913d59ff3938ea384358c73099c408823 Mon Sep 17 00:00:00 2001
+From 002b30f2a8762e6a218a55e07afdec9267de0bfd Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 9 Jan 2014 14:19:12 +0000
 Subject: [PATCH] Fix anvil collisions
@ -25,5 +25,5 @@ index 9e1ce2f..1fa14c5 100644
         return false;
     }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch
+++ b/CraftBukkit-Patches/0085-Fix-ItemStack-Unbreakable-Code.patch
@ -1,11 +1,11 @@
-From e0f5638e4fd03405ebbd607f1c812e73cbea6224 Mon Sep 17 00:00:00 2001
+From f5c697b1176be4c09d3132b53508889c776b6f05 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 10 Jan 2014 15:15:50 +1100
 Subject: [PATCH] Fix ItemStack Unbreakable Code


 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index f32322e..37ceade 100644
+index cc18816..a535479 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -130,7 +130,13 @@ public final class ItemStack {
@ -24,5 +24,5 @@ index f32322e..37ceade 100644
 
     public boolean usesData() {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0086-Try-and-Debug-Crash-Reports-Crashing.patch
@ -1,4 +1,4 @@
-From 51b1cf05d2a290cdda7149222d85015d8c621404 Mon Sep 17 00:00:00 2001
+From 0d37926dd3c071cecefa8a776b87f850ea6f6f35 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing
--- a/CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0087-Replace-AutoSave-Mechanism.patch
@ -1,4 +1,4 @@
-From 1718ec0e918db8a2093caa5c4483589c3a4258d9 Mon Sep 17 00:00:00 2001
+From 01bee39d466c003e572fe62e357c0772b98f2bfd Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Replace AutoSave Mechanism
--- a/CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch
+++ b/CraftBukkit-Patches/0088-Block-data-values-that-crash-the-client.patch
@ -1,11 +1,11 @@
-From e89c5539efa8295858391942017062ec91a5d3d5 Mon Sep 17 00:00:00 2001
+From 1edaeb85842f11c24fc17f3c26446aaf33c4c47b Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 15 Jan 2014 21:52:47 +0000
 Subject: [PATCH] Block data values that crash the client


 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 51ebb7e..944170b 100644
+index 3712009..90f32ed 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -115,7 +115,7 @@ public class Chunk {
@ -57,5 +57,5 @@ index 51ebb7e..944170b 100644
 
                     if (tileentity != null) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch
+++ b/CraftBukkit-Patches/0089-Support-vanilla-s-direction-tag-on-fireballs.patch
@ -1,11 +1,11 @@
-From cea6b0426484e45c9bf8ec4a718be75c10f77b83 Mon Sep 17 00:00:00 2001
+From b8f122c7ade82ee6937edbdf2f0cf3e72f98c7b1 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 14:27:03 +0000
 Subject: [PATCH] Support vanilla's direction tag on fireballs


 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 939de5d..436e6a1 100644
+index 0eecaad..b14c73e 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -199,6 +199,8 @@ public abstract class EntityFireball extends Entity {
@ -32,5 +32,5 @@ index 939de5d..436e6a1 100644
             this.die();
         }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch
+++ b/CraftBukkit-Patches/0090-Support-non-prefixed-URLs.patch
@ -1,4 +1,4 @@
-From cf7c5f8a401cfc2d888f819689ed2b354def7944 Mon Sep 17 00:00:00 2001
+From c214ae29c2df46b339bfb2d74b240f7ec95dac4f Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 19:32:42 +0000
 Subject: [PATCH] Support non-prefixed URLs
--- a/CraftBukkit-Patches/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
+++ b/CraftBukkit-Patches/0091-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
@ -1,4 +1,4 @@
-From b67104a09a6c177b47c45702310bf1d3b63817e0 Mon Sep 17 00:00:00 2001
+From ad09c4206bf645b88a740e0f1692a003d804beda Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:44:07 +1100
 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
@ -29,5 +29,5 @@ index 49b3f14..4d6a9da 100644
         this.data = new int[j];
 
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0092-Reduce-memory-of-hiddenPlayers-map.patch
+++ b/CraftBukkit-Patches/0092-Reduce-memory-of-hiddenPlayers-map.patch
@ -1,11 +1,11 @@
-From 5f890235c56ef21d940855867f18fb2e4e8ea75c Mon Sep 17 00:00:00 2001
+From e2defad641150ed835c851d1db39ecc18cb95978 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:50:32 +1100
 Subject: [PATCH] Reduce memory of hiddenPlayers map.


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0e8fedf..a717d34 100644
+index 3fcab5d..7a96a3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -63,7 +63,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -18,5 +18,5 @@ index 0e8fedf..a717d34 100644
     private double health = 20;
     private boolean scaledHealth = false;
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0093-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
+++ b/CraftBukkit-Patches/0093-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
@ -1,11 +1,11 @@
-From d0df8fa002cb346745fc63550f641c258b39348b Mon Sep 17 00:00:00 2001
+From 7796ac75a3c9273d2d1f8f6baa1a0fbf1b987514 Mon Sep 17 00:00:00 2001
 From: Dmck2b <dmck2b+github@gmail.com>
 Date: Mon, 20 Jan 2014 20:18:23 +0000
 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks


 diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
-index bec5aa8..222e3ac 100644
+index 1356f13..b361775 100644
 --- a/src/main/java/net/minecraft/server/BlockPortal.java
 +++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -15,7 +15,7 @@ public class BlockPortal extends BlockHalfTransparent {
@ -34,5 +34,5 @@ index 558e9cd..ffdb33e 100644
 +    }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0094-Don-t-let-trees-replace-any-block-when-growing.patch
+++ b/CraftBukkit-Patches/0094-Don-t-let-trees-replace-any-block-when-growing.patch
@ -1,4 +1,4 @@
-From f1d54a03a0b311b90f43910dfd13d9f61e78328f Mon Sep 17 00:00:00 2001
+From fc6f0c098daa08c47192a1a255d1f5731682feb4 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 20 Jan 2014 20:42:28 +0000
 Subject: [PATCH] Don't let trees replace any block when growing
@ -23,5 +23,5 @@ index 71ce973..caaac9a 100644
 
                                 int l3;
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0095-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0095-Highly-Optimized-Tick-Loop.patch
@ -1,4 +1,4 @@
-From 3cf7361b54a335fa6e80a35f433df2fae4308793 Mon Sep 17 00:00:00 2001
+From 5463478685cd7c0ecc0a54304adfae6ac8c219d9 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
@ -161,5 +161,5 @@ index 0000000..2b8343d
 +    }
 +}
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0096-Add-Spigot-Links.patch
+++ b/CraftBukkit-Patches/0096-Add-Spigot-Links.patch
@ -1,4 +1,4 @@
-From c866d297a5749aa9bc87b3719eaac899788cc49b Mon Sep 17 00:00:00 2001
+From 06fbaef63c1db7de3b8d108a864177b396f93280 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 23 Jan 2014 13:17:35 +1100
 Subject: [PATCH] Add Spigot Links
@ -75,5 +75,5 @@ index 0a5d414..d6bcf5c 100644
 command-block-overrides: []
 aliases:
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0097-Configurable-Ping-Sample-Size.patch
+++ b/CraftBukkit-Patches/0097-Configurable-Ping-Sample-Size.patch
@ -1,4 +1,4 @@
-From 3bf1f26e709a344b5e3d93485571dcb1e04a055d Mon Sep 17 00:00:00 2001
+From a5ee9f8ccbb9361394accd391f1a0a420b41950f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 26 Jan 2014 21:48:34 +1100
 Subject: [PATCH] Configurable Ping Sample Size
@ -39,5 +39,5 @@ index 713b351..ba28878 100644
 +    }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0098-Add-Optional-Tick-Shuffling.patch
+++ b/CraftBukkit-Patches/0098-Add-Optional-Tick-Shuffling.patch
@ -1,4 +1,4 @@
-From c497fddd7e3472fa67c89a213231b4c4afdbc385 Mon Sep 17 00:00:00 2001
+From 3ed47f2e9a03b284f414f00fe7d830c086d2f0f3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 27 Jan 2014 08:39:26 +1100
 Subject: [PATCH] Add Optional Tick Shuffling
@ -6,7 +6,7 @@ Subject: [PATCH] Add Optional Tick Shuffling
 This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order.

 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 3691094..c91ed8e 100644
+index c2194af..1d7b814 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
@@ -53,6 +53,13 @@ public class ServerConnection {
@ -39,5 +39,5 @@ index ba28878..61fb942 100644
 +    }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0099-Allow-Configuring-Chunks-per-Packet.patch
+++ b/CraftBukkit-Patches/0099-Allow-Configuring-Chunks-per-Packet.patch
@ -1,14 +1,14 @@
-From cfde0347aea037b965103659e74da0448c8e8f45 Mon Sep 17 00:00:00 2001
+From 582b9d174f641b75c8e5b64e243bf65822a8de48 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 982a696..9981da2 100644
+index fda1e26..c1caca7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -215,7 +215,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -214,7 +214,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
             Chunk chunk;
 
--- a/CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch
+++ b/CraftBukkit-Patches/0100-Implement-Locale-Getter-for-Players.patch
@ -1,11 +1,11 @@
-From c7ec7ec185c3fb466f1a4e4b6de3d44104663d2b Mon Sep 17 00:00:00 2001
+From 0c72b73039ba352ba54357abae4110541b274f42 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f01d798..3785bc5 100644
+index c1caca7..ca06f60 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -30,7 +30,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -18,7 +18,7 @@ index f01d798..3785bc5 100644
     public final MinecraftServer server;
     public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index db10d5f..cb1346d 100644
+index 7a96a3f..23d9612 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1335,6 +1335,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/CraftBukkit-Patches/0101-Cap-Entity-Collisions.patch
+++ b/CraftBukkit-Patches/0101-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From 21601386ee449ed1a1cf00959ee6ea63f6049c37 Mon Sep 17 00:00:00 2001
+From 0b68acc5fcff9bb719e524a03404d303f28d45a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 31 Jan 2014 11:18:34 -0500
 Subject: [PATCH] Cap Entity Collisions
@ -19,7 +19,7 @@ index 0ec07c2..c049cd8 100644
         if (entity.passenger != this && entity.vehicle != this) {
             double d0 = entity.locX - this.locX;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c04ff95..7ec500e 100644
+index 90c0e82..33533c7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1491,7 +1491,9 @@ public abstract class EntityLiving extends Entity {
--- a/CraftBukkit-Patches/0102-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
+++ b/CraftBukkit-Patches/0102-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
@ -1,11 +1,11 @@
-From 3dc66a246b54d3b365341a023590835b41d2758c Mon Sep 17 00:00:00 2001
+From a67cb3e9052cec5fb4c7a84ce714f8091ed1ca9d Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 6 Feb 2014 21:59:20 +0000
 Subject: [PATCH] Fix dispensing bone meal not having the correct data value


 diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java b/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java
-index 92b3789..a164627 100644
+index b547bc9..c06e9a1 100644
 --- a/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java
 +++ b/src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java
@@ -21,7 +21,7 @@ final class DispenseBehaviorBonemeal extends DispenseBehaviorItem {
@ -18,5 +18,5 @@ index 92b3789..a164627 100644
             BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
             if (!BlockDispenser.eventFired) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0103-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0103-Spam-Filter-Exclusions.patch
@ -1,11 +1,11 @@
-From a98391a77bc197068d6d3fe0ab2f29817e7c23d4 Mon Sep 17 00:00:00 2001
+From 8178e7df810e05d3fc3e92ae22420f689d31dd59 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1b862fb..692432b 100644
+index 28bf9d4..92f95d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -848,9 +848,19 @@ public class PlayerConnection implements PacketPlayInListener {
@ -56,5 +56,5 @@ index 61fb942..8da3cc9 100644
 +    }
 }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0104-Add-Option-to-Silence-CommandBlock-Console.patch
+++ b/CraftBukkit-Patches/0104-Add-Option-to-Silence-CommandBlock-Console.patch
@ -1,4 +1,4 @@
-From 04234e66e787b65eb2f03b64bf6242a20bc620c2 Mon Sep 17 00:00:00 2001
+From a7b42fb91500ce69102e9fa2007fe059f1420eb3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 9 Feb 2014 14:39:01 +1100
 Subject: [PATCH] Add Option to Silence CommandBlock Console
--- a/CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0105-Add-support-for-fetching-hidden-players.patch
@ -1,11 +1,11 @@
-From 86eef05ad745fa9e845d5449598bb05b450d95e9 Mon Sep 17 00:00:00 2001
+From 9b9f64c29e0f3ccb457b478c1b7c987022b6651d Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1f685e1..8d87137 100644
+index 23d9612..f687308 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1341,6 +1341,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
--- a/CraftBukkit-Patches/0106-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0106-Allow-Disabling-Creative-Item-Filter.patch
@ -1,11 +1,11 @@
-From 1af355c62609dbdb96ea0a2def182843748a7a8f Mon Sep 17 00:00:00 2001
+From 31f63511094b848c05597c101ca419edfaf88c88 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 18:18:01 +1100
 Subject: [PATCH] Allow Disabling Creative Item Filter


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d79a0a4..60d0f54 100644
+index 92f95d7..eb5b84e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1501,7 +1501,7 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch
+++ b/CraftBukkit-Patches/0107-Cap-Channel-Registrations.patch
@ -1,11 +1,11 @@
-From ae72d4bff8af8d68d688e4c81e3ec86a7ceba32e Mon Sep 17 00:00:00 2001
+From e512af6b5412f7e32846fa124d3f45536582cf5c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index db6e5b8..9b0672b 100644
+index f687308..5d7e77f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1023,6 +1023,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -17,5 +17,5 @@ index db6e5b8..9b0672b 100644
             server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
         }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0108-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
+++ b/CraftBukkit-Patches/0108-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
@ -1,4 +1,4 @@
-From 46d4a89c6e759170ea5806af0b0b1557d8135ea1 Mon Sep 17 00:00:00 2001
+From 8953efdfb6f804ebcb5a99e189d52049c3fd0917 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command
--- a/CraftBukkit-Patches/0109-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0109-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@ -1,4 +1,4 @@
-From f78a24b5f6db5880964917c9d66605f1754e7b27 Mon Sep 17 00:00:00 2001
+From 7bb5cc8ec41e6a6e46862133b9aeeedf74898cab Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@ -19,5 +19,5 @@ index eb5b84e..ed144b5 100644
     }
     // CraftBukkit end
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0110-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0110-Implement-Silenceable-Lightning-API.patch
@ -1,4 +1,4 @@
-From 95af34d7340d8772be99a89e33791d100b12c8e0 Mon Sep 17 00:00:00 2001
+From 43af10b048158eeffddb985239c05aee140e7fc3 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
@ -37,7 +37,7 @@ index 2fd88c0..35806d1 100644
             this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + this.random.nextFloat() * 0.2F);
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 363d8e2..466c687 100644
+index 827ec16..154b868 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1326,6 +1326,22 @@ public class CraftWorld implements World {
--- a/CraftBukkit-Patches/0111-Normalize-spaces-on-when-reading-a-chat-packet.patch
+++ b/CraftBukkit-Patches/0111-Normalize-spaces-on-when-reading-a-chat-packet.patch
@ -1,4 +1,4 @@
-From 467530c9aef6f5c2ef1a059f05a0cb3b4f7e301b Mon Sep 17 00:00:00 2001
+From b141539e09000546904ce74293f645189cc32b56 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 26 Feb 2014 14:45:22 +0000
 Subject: [PATCH] Normalize spaces on when reading a chat packet
@ -18,7 +18,7 @@ index d419f0f..b26c290 100644
 
     public void b(PacketDataSerializer packetdataserializer) throws IOException { // CraftBukkit - added throws
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3d03320..5dd2a0a 100644
+index ed144b5..1fdec85 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -791,7 +791,7 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0112-Use-one-PermissibleBase-for-all-Command-Blocks.patch
+++ b/CraftBukkit-Patches/0112-Use-one-PermissibleBase-for-all-Command-Blocks.patch
@ -1,4 +1,4 @@
-From 8874d7fa1266d5a439e4f2ab355f7c5ef4389357 Mon Sep 17 00:00:00 2001
+From 8f25af043107809146a1985032f907e329261a15 Mon Sep 17 00:00:00 2001
 From: FrozenBrain <carstenbamsti@googlemail.com>
 Date: Sun, 2 Mar 2014 21:13:46 +0100
 Subject: [PATCH] Use one PermissibleBase for all Command Blocks
@ -29,5 +29,5 @@ index 1314c74..b339cf3 100644
 
     public boolean isPermissionSet(String name) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0113-Prevent-hoppers-from-loading-chunks.patch
+++ b/CraftBukkit-Patches/0113-Prevent-hoppers-from-loading-chunks.patch
@ -1,11 +1,11 @@
-From c754a26dda63eab9bc55e6153e0b347c956dbeeb Mon Sep 17 00:00:00 2001
+From aa3ab8bdcda4e19b4cda8f5062c88f5aff0662b8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 5 Mar 2014 20:27:27 +0000
 Subject: [PATCH] Prevent hoppers from loading chunks


 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index a19863a..8ace84f 100644
+index d7a3178..b6718bf 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -540,6 +540,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
--- a/CraftBukkit-Patches/0114-Guard-Entity-List.patch
+++ b/CraftBukkit-Patches/0114-Guard-Entity-List.patch
@ -1,11 +1,11 @@
-From 17538979839edcf3f31226b8216a08ba6faad631 Mon Sep 17 00:00:00 2001
+From 3a7268352455d69debcfd9876010a2eacc948737 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 10 Mar 2014 09:03:28 +1100
 Subject: [PATCH] Guard Entity List


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b355d00..cf2245e 100644
+index a00075a..113b376 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -29,7 +29,32 @@ import org.bukkit.event.weather.ThunderChangeEvent;
--- a/CraftBukkit-Patches/0115-Fix-ConcurrentModificationException-while-being-idle.patch
+++ b/CraftBukkit-Patches/0115-Fix-ConcurrentModificationException-while-being-idle.patch
@ -1,4 +1,4 @@
-From 97ded54c11639e45156c76c29d36cfbbd1610dc5 Mon Sep 17 00:00:00 2001
+From e0af3e9026f4324b247dd25f41f460bce8d117ad Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 14 Jan 2014 20:11:25 +0000
 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cf2245e..8aa11c2 100644
+index 113b376..2f9f300 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1042,23 +1042,24 @@ public abstract class World implements IBlockAccess {
--- a/CraftBukkit-Patches/0116-Cancellable-WitherSkull-potion-effect.patch
+++ b/CraftBukkit-Patches/0116-Cancellable-WitherSkull-potion-effect.patch
@ -1,11 +1,11 @@
-From 300acb214df362bccede10b67b02fd974f353ea4 Mon Sep 17 00:00:00 2001
+From 8af19cc627974e2aff803c3276dff058f7ca4f52 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Tue, 25 Feb 2014 15:15:26 -0400
 Subject: [PATCH] Cancellable WitherSkull potion effect


 diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
-index 2d428f9..de0f2bb 100644
+index d749175..b8c3cef 100644
 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
@@ -35,15 +35,19 @@ public class EntityWitherSkull extends EntityFireball {
@ -32,5 +32,5 @@ index 2d428f9..de0f2bb 100644
 
                     if (this.world.difficulty == EnumDifficulty.NORMAL) {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0117-Optimize-Player-Lookup.patch
+++ b/CraftBukkit-Patches/0117-Optimize-Player-Lookup.patch
@ -1,4 +1,4 @@
-From fe37c8f84144ee7226e7e5f44a3e8a4f826af8c8 Mon Sep 17 00:00:00 2001
+From e767a7a0499b068d6195f5b6585b062a45d57fed Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 15 Mar 2014 14:34:03 +1100
 Subject: [PATCH] Optimize Player Lookup
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Player Lookup
 Optimize player lookup and various player operations. We mainly do this by keeping a map instead of iterating through all players. We also speed up the duplicate login check and a few other checks by simply checking for one matching player.

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a2599ec..77b6193 100644
+index 385dc0a..4a651b6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -56,6 +56,25 @@ public abstract class PlayerList {
@ -58,16 +58,16 @@ index a2599ec..77b6193 100644
 -        ArrayList arraylist = new ArrayList();
 -
 -        EntityPlayer entityplayer;
-+        // Spigot Start
-+        EntityPlayer entityplayer = getPlayer( gameprofile.getName() );
- 
+-
 -        for (int i = 0; i < this.players.size(); ++i) {
 -            entityplayer = (EntityPlayer) this.players.get(i);
 -            if (entityplayer.getName().equalsIgnoreCase(gameprofile.getName())) {
 -                arraylist.add(entityplayer);
 -            }
 -        }
-
+        // Spigot Start
+        EntityPlayer entityplayer = getPlayer( gameprofile.getName() );
+ 
 -        Iterator iterator = arraylist.iterator();
 -
 -        while (iterator.hasNext()) {
@ -81,7 +81,7 @@ index a2599ec..77b6193 100644
 
         /* CraftBukkit start
         Object object;
-@@ -886,19 +898,7 @@ public abstract class PlayerList {
+@@ -867,19 +879,7 @@ public abstract class PlayerList {
     }
 
     public EntityPlayer getPlayer(String s) {
@ -164,7 +164,7 @@ index a388ec7..c7f1c95 100644
 
     public int broadcastMessage(String message) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fa51a4c..0895491 100644
+index 5d7e77f..bee7abe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -94,13 +94,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -183,5 +183,5 @@ index fa51a4c..0895491 100644
 
     public InetSocketAddress getAddress() {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0118-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0118-Descriptive-kick-reasons-instead-of-Nope.patch
@ -1,4 +1,4 @@
-From 696041a1d9b08bc6f169cf4e743362ed05e3be5d Mon Sep 17 00:00:00 2001
+From 9736476e1048695b00a61efdda4abe1c7d098f31 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
@ -27,7 +27,7 @@ index c049cd8..37a9cae 100644
             f1 = 0;
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5dd2a0a..9649ba6 100644
+index 1fdec85..b2cde75 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -183,7 +183,7 @@ public class PlayerConnection implements PacketPlayInListener {
--- a/CraftBukkit-Patches/0119-Allow-enchanting-tables-to-enchant-any-item.patch
+++ b/CraftBukkit-Patches/0119-Allow-enchanting-tables-to-enchant-any-item.patch
@ -1,11 +1,11 @@
-From 718db1e4e0a70ff25b8c38305fb79afd0707233e Mon Sep 17 00:00:00 2001
+From 4b55b1c0354600be33f73d04a58f0bbf83df7047 Mon Sep 17 00:00:00 2001
 From: andrepl <andre@norcode.com>
 Date: Sat, 15 Mar 2014 12:50:00 -0400
 Subject: [PATCH] Allow enchanting tables to enchant any item


 diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
-index cc36e2b..7c0d998 100644
+index 528fbc9..372ccde 100644
 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java
 +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
@@ -152,6 +152,11 @@ public class ContainerEnchantTable extends Container {
@ -30,5 +30,5 @@ index cc36e2b..7c0d998 100644
                         } catch (IllegalArgumentException e) {
                             /* Just swallow invalid enchantments */
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0

--- a/CraftBukkit-Patches/0120-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
+++ b/CraftBukkit-Patches/0120-Remove-the-lastChunkAccessed-if-it-is-unloaded.patch
@ -1,4 +1,4 @@
-From e903a62a93d1db04232d902a7de96e40953609bb Mon Sep 17 00:00:00 2001
+From b3502d90dfb5e97bde75acca10428ca5a0c225c8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 18 Mar 2014 09:49:30 +0000
 Subject: [PATCH] Remove the lastChunkAccessed if it is unloaded.
@ -24,7 +24,7 @@ index 7f19bec..a9ef533 100644
                 ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
                 server.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8aa11c2..26c97af 100644
+index 2f9f300..7529e0c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -153,7 +153,7 @@ public abstract class World implements IBlockAccess {
@ -37,7 +37,7 @@ index 8aa11c2..26c97af 100644
     int lastZAccessed = Integer.MIN_VALUE;
     final Object chunkLock = new Object();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 466c687..a7393db 100644
+index 154b868..8592205 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -187,6 +187,14 @@ public class CraftWorld implements World {
--- a/CraftBukkit-Patches/0121-Check-for-manually-prefixed-commands-or-commands-tha.patch
+++ b/CraftBukkit-Patches/0121-Check-for-manually-prefixed-commands-or-commands-tha.patch
@ -1,4 +1,4 @@
-From 6683ed72e463e91b5e759902cc90dd07075479bf Mon Sep 17 00:00:00 2001
+From 6acc3b0242132d71abcf72235ab2ddb642437571 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 01:12:10 +0000
 Subject: [PATCH] Check for manually prefixed commands or commands that don't
--- a/CraftBukkit-Patches/0122-Cap-villagers-window-name-to-prevent-client-disconne.patch
+++ b/CraftBukkit-Patches/0122-Cap-villagers-window-name-to-prevent-client-disconne.patch
@ -1,14 +1,14 @@
-From 8692b48890a732c5729f50d1f1729da8711834b7 Mon Sep 17 00:00:00 2001
+From bbc9173afbca5aba3c761b7c724618105c63f7cf Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 10:53:48 +0000
 Subject: [PATCH] Cap villagers' window name to prevent client disconnects


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 787c764..5788872 100644
+index ca06f60..27f9dc9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -756,6 +756,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -755,6 +755,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.activeContainer.addSlotListener(this);
         InventoryMerchant inventorymerchant = ((ContainerMerchant) this.activeContainer).getMerchantInventory();
 
@ -17,5 +17,5 @@ index 787c764..5788872 100644
         MerchantRecipeList merchantrecipelist = imerchant.getOffers(this);
 
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0