diff --git a/Bukkit-Patches/0004-BungeeCord-Support.patch b/Bukkit-Patches/0004-BungeeCord-Support.patch
index 0d0098349b..cc152dbc8d 100644
--- a/Bukkit-Patches/0004-BungeeCord-Support.patch
+++ b/Bukkit-Patches/0004-BungeeCord-Support.patch
@@ -1,14 +1,14 @@
-From e2de26074e47e4b5395e447ce838424d51c1b65b Mon Sep 17 00:00:00 2001
+From 28fcaf994cb381caea6fb5e3f490901de73aebcb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c10ffa1..6d435d3 100644
+index 6b955e4..b60bdf6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1046,4 +1046,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1055,4 +1055,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * {@link GameMode#SPECTATOR}
       */
      public void setSpectatorTarget(Entity entity);
diff --git a/Bukkit-Patches/0006-Add-Particle-API.patch b/Bukkit-Patches/0006-Add-Particle-API.patch
index 13e9b57f1b..fb725145f2 100644
--- a/Bukkit-Patches/0006-Add-Particle-API.patch
+++ b/Bukkit-Patches/0006-Add-Particle-API.patch
@@ -1,4 +1,4 @@
-From e81b734874b999f611343b37baa63e8daee38707 Mon Sep 17 00:00:00 2001
+From fd2b5c26b1ca395533cad576b1354f04ee18293d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
@@ -332,10 +332,10 @@ index 127ad9d..6613286 100644
       * Gets the world border for this world.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6d435d3..49b53ac 100644
+index b60bdf6..524a8d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1061,6 +1061,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1070,6 +1070,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0012-Player-Collision-API.patch b/Bukkit-Patches/0012-Player-Collision-API.patch
index 9bb6ad1eb4..611782a719 100644
--- a/Bukkit-Patches/0012-Player-Collision-API.patch
+++ b/Bukkit-Patches/0012-Player-Collision-API.patch
@@ -1,14 +1,14 @@
-From 7aff8c19e086c661dd6c026f3dd09ab39afa3211 Mon Sep 17 00:00:00 2001
+From 9374f413d001d2151e96b195f6a8d8b5c6183a7f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 49b53ac..29992f0 100644
+index 524a8d9..c31faf4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1066,6 +1066,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1075,6 +1075,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0015-Add-respawn-API.patch b/Bukkit-Patches/0015-Add-respawn-API.patch
index a4d46359ae..051af49945 100644
--- a/Bukkit-Patches/0015-Add-respawn-API.patch
+++ b/Bukkit-Patches/0015-Add-respawn-API.patch
@@ -1,14 +1,14 @@
-From e6f1923042dd703d84725f437ef9fed81588b484 Mon Sep 17 00:00:00 2001
+From 2779c79eff1bdcd51f3712dd812bc339fbca701a Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 29992f0..d8a4b67 100644
+index c31faf4..9c473a5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1087,6 +1087,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1096,6 +1096,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
index b2ec612042..3810500cb8 100644
--- a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
+++ b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
@@ -1,14 +1,14 @@
-From 9251378c4372bcb6df2367fcad83be94413f57a7 Mon Sep 17 00:00:00 2001
+From ebf11313636c42d00d968199ea8073fec321d2d7 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d8a4b67..84e6f20 100644
+index 9c473a5..9c69579 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1095,6 +1095,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1104,6 +1104,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
index a132965c7f..2129da72d8 100644
--- a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
+++ b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
@@ -1,14 +1,14 @@
-From db6c1b27104654f3e40e0aa8a9da607eeb1e639f Mon Sep 17 00:00:00 2001
+From 7342c02c8046b9b76b14c00d99011a4544ee5755 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 84e6f20..2d67970 100644
+index 9c69579..93f57ac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1105,6 +1105,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1114,6 +1114,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0028-BungeeCord-Chat-API.patch b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch
index 009b101614..37a125d94d 100644
--- a/Bukkit-Patches/0028-BungeeCord-Chat-API.patch
+++ b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch
@@ -1,4 +1,4 @@
-From 4b32a5b07e36e10190b36d00109a8955d731198a Mon Sep 17 00:00:00 2001
+From 90f34dc0f7fbe4beb33ccba5e6db824c019e53e7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 12:59:14 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -53,10 +53,10 @@ index 52dd005..20edb77 100644
  
      Spigot spigot();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7a0815c..83cc008 100644
+index 84cb51f..e3dd596 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1113,6 +1113,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1122,6 +1122,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index 3b09aa681c..87e9c73326 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From 12ef1389396b4a8488c6abba12e60fb841714f88 Mon Sep 17 00:00:00 2001
+From bbdbd8c3974009a96c69dc0819d92c0409238bf8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -25,10 +25,10 @@ index 8849087..0b0074d 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9e158e1..80fc5bf 100644
+index 8c9ead5..b6bd255 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1369,4 +1369,14 @@ public class CraftWorld implements World {
+@@ -1383,4 +1383,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.locX, chunk.locZ);
          }
      }
@@ -104,10 +104,10 @@ index 64e346d..243e8e5 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 82e2a90..b3c428b 100644
+index 813adbb..3fe57cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1320,4 +1320,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1326,4 +1326,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(getGameMode() == GameMode.SPECTATOR, "Player must be in spectator mode");
          getHandle().setSpectatorTarget((entity == null) ? null : ((CraftEntity) entity).getHandle());
      }
diff --git a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch
index 2cf690f62d..ba97aac464 100644
--- a/CraftBukkit-Patches/0009-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0009-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From dd9dfa3800108e16a922d3dcc27b4644c367fc1b Mon Sep 17 00:00:00 2001
+From 615eaf3a0d839c48710b257037e809b0544827e0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@@ -106,10 +106,10 @@ index df4d9cd..68f4996 100644
          // this.entityList.addAll(collection);
          Iterator iterator = collection.iterator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 80fc5bf..441f8a3 100644
+index b6bd255..18f4f21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -166,6 +166,7 @@ public class CraftWorld implements World {
+@@ -167,6 +167,7 @@ public class CraftWorld implements World {
      }
  
      public boolean unloadChunkRequest(int x, int z, boolean safe) {
@@ -117,7 +117,7 @@ index 80fc5bf..441f8a3 100644
          if (safe && isChunkInUse(x, z)) {
              return false;
          }
-@@ -176,6 +177,7 @@ public class CraftWorld implements World {
+@@ -177,6 +178,7 @@ public class CraftWorld implements World {
      }
  
      public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@@ -125,7 +125,7 @@ index 80fc5bf..441f8a3 100644
          if (safe && isChunkInUse(x, z)) {
              return false;
          }
-@@ -243,6 +245,7 @@ public class CraftWorld implements World {
+@@ -244,6 +246,7 @@ public class CraftWorld implements World {
      }
  
      public boolean loadChunk(int x, int z, boolean generate) {
@@ -134,7 +134,7 @@ index 80fc5bf..441f8a3 100644
          if (generate) {
              // Use the default variant of loadChunk when generate == true.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b3c428b..098a0d8 100644
+index 3fe57cf..ae25252 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0011-Spigot-Timings.patch b/CraftBukkit-Patches/0011-Spigot-Timings.patch
index d5373b802c..19cca2847e 100644
--- a/CraftBukkit-Patches/0011-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0011-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From 6408d0d5b54887a507042c3d6884fdd91f17e41e Mon Sep 17 00:00:00 2001
+From a88c31aaedf181cd24f119991ee777ffebc767da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
 Overhauls the Timings System adding performance tracking all around the Minecraft Server
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3923cd1..f22e695 100644
+index 1b68736..7e7aa11 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -901,6 +901,7 @@ public class Chunk {
@@ -26,7 +26,7 @@ index 3923cd1..f22e695 100644
  
      public BlockPosition h(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9bd173b..74710f9 100644
+index 0ae736d..af77eef 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -132,6 +132,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 24ecbd2..22d51aa 100644
+index f23f5ba..c03110d 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -20,6 +20,7 @@ import java.io.PrintStream;
@@ -134,7 +134,7 @@ index 24ecbd2..22d51aa 100644
  
      public boolean ae() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d004df3..d3c7d1b 100644
+index 3fb3502..0e6a905 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -16,6 +16,7 @@ import org.bukkit.entity.Hanging;
@@ -171,7 +171,7 @@ index d004df3..d3c7d1b 100644
  
      private void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2e81b7e..0638f6f 100644
+index 8125cb9..6ef9c83 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -242,7 +242,7 @@ index 2e81b7e..0638f6f 100644
  
          this.world.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4941eed..fe61577 100644
+index 35a6dee..387e75b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -46,6 +46,7 @@ import joptsimple.OptionSet;
@@ -367,7 +367,7 @@ index 4941eed..fe61577 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bf8edb6..48f7501 100644
+index f0ac552..de5efbe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1063,6 +1063,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -529,7 +529,7 @@ index 68f4996..45cafe7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b245159..fba6814 100644
+index 9c0bcfe..8a1165c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -223,10 +223,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -599,10 +599,10 @@ index 37c403d..396c034 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 441f8a3..ef1ff3f 100644
+index 18f4f21..41daf0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -256,9 +256,11 @@ public class CraftWorld implements World {
+@@ -257,9 +257,11 @@ public class CraftWorld implements World {
          net.minecraft.server.Chunk chunk = world.chunkProviderServer.chunks.get(LongHash.toLong(x, z));
  
          if (chunk == null) {
diff --git a/CraftBukkit-Patches/0036-Player-Collision-API.patch b/CraftBukkit-Patches/0036-Player-Collision-API.patch
index afdea36fc8..a4c659fbd0 100644
--- a/CraftBukkit-Patches/0036-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0036-Player-Collision-API.patch
@@ -1,4 +1,4 @@
-From 920351331bf866635c2199b4dea47c5450c4ef0a Mon Sep 17 00:00:00 2001
+From 75fe922e23f20ed1faef60d344900a1864967a65 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
@@ -64,10 +64,10 @@ index e707dd7..b0681cf 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 098a0d8..0ef7321 100644
+index ae25252..5236f8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1325,6 +1325,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1331,6 +1331,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {
diff --git a/CraftBukkit-Patches/0045-Implement-respawn-API.patch b/CraftBukkit-Patches/0045-Implement-respawn-API.patch
index 21672496b9..17fd07b790 100644
--- a/CraftBukkit-Patches/0045-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0045-Implement-respawn-API.patch
@@ -1,14 +1,14 @@
-From c76b2749bc0cb7d994cccf365d6c55677fabb721 Mon Sep 17 00:00:00 2001
+From 912676be4d810f5268b2dfb76c86b4f976953ae7 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 99cac72..7935f4f 100644
+index 001415a..7310212 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1338,6 +1338,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1344,6 +1344,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().k = collides; // First boolean of Entity
          }
diff --git a/CraftBukkit-Patches/0055-BungeeCord-Support.patch b/CraftBukkit-Patches/0055-BungeeCord-Support.patch
index 12129d8d9e..074086f38e 100644
--- a/CraftBukkit-Patches/0055-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0055-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From f06c7b5594844d4b1f9153d6940d049fc8e4504d Mon Sep 17 00:00:00 2001
+From 7b42c80ec6eb9e4ab3490704eee7e085c8a29e70 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
@@ -176,10 +176,10 @@ index d07b3b8..2801b5c 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7935f4f..3f79e7f 100644
+index 7310212..d0e340e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1327,6 +1327,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1333,6 +1333,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      {
  
          @Override
diff --git a/CraftBukkit-Patches/0060-Particle-API.patch b/CraftBukkit-Patches/0060-Particle-API.patch
index 3c80aea702..579e3f3c5f 100644
--- a/CraftBukkit-Patches/0060-Particle-API.patch
+++ b/CraftBukkit-Patches/0060-Particle-API.patch
@@ -1,4 +1,4 @@
-From 8bbfc7f6ef54134206e0b31b3192ea69169ea41e Mon Sep 17 00:00:00 2001
+From 2be988a9a8f53aa0a06de8e3c5236d27e7bae661 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
@@ -19,10 +19,10 @@ index 7de0de5..13f9e9d 100644
              datavalue = 0;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ef1ff3f..5d12a5c 100644
+index 41daf0a..8cd2bbb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -838,28 +838,18 @@ public class CraftWorld implements World {
+@@ -839,28 +839,18 @@ public class CraftWorld implements World {
              Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
          }
  
@@ -60,7 +60,7 @@ index ef1ff3f..5d12a5c 100644
      }
  
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
-@@ -1377,6 +1367,70 @@ public class CraftWorld implements World {
+@@ -1391,6 +1381,70 @@ public class CraftWorld implements World {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {
@@ -132,7 +132,7 @@ index ef1ff3f..5d12a5c 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 3f79e7f..295565e 100644
+index d0e340e..add5310 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -323,9 +323,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -146,7 +146,7 @@ index 3f79e7f..295565e 100644
      }
  
      @Override
-@@ -1353,6 +1351,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1359,6 +1357,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
              }
          }
diff --git a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
index 9d897b0efb..afd3a210f1 100644
--- a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
@@ -1,4 +1,4 @@
-From 19e19dfa1e43e3afbaddb20de3c66cf352f31a3a Mon Sep 17 00:00:00 2001
+From e4e219357c40024a14ffbbb6be133a8e215e8336 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] Improve AutoSave Mechanism
@@ -37,7 +37,7 @@ index af77eef..975d666 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 69a99cb..37c0627 100644
+index 0645e6b..c59f441 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -657,7 +657,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -60,10 +60,10 @@ index 69a99cb..37c0627 100644
              SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5d12a5c..a4d396d 100644
+index 8cd2bbb..fa593f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -742,12 +742,17 @@ public class CraftWorld implements World {
+@@ -743,12 +743,17 @@ public class CraftWorld implements World {
      }
  
      public void save() {
diff --git a/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch
index 1ac3b3668c..0ad8c385f5 100644
--- a/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch
+++ b/CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch
@@ -1,4 +1,4 @@
-From e844cd4434f68fe2e188a4ad4b2c198a239310e6 Mon Sep 17 00:00:00 2001
+From ff97313c051220642cbddada3b310bd70dec43c8 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
@@ -18,10 +18,10 @@ index ffdf25c..3438d3a 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 1a38905..1d71a65 100644
+index 765a035..2ac69fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1408,6 +1408,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1414,6 +1414,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  getHandle().playerConnection.sendPacket( packet );
              }
          }
diff --git a/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch
index f3662cc5c5..7fa5eb8762 100644
--- a/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch
@@ -1,14 +1,14 @@
-From a8849c0013aec5ed917c411dd61403f07c168077 Mon Sep 17 00:00:00 2001
+From 042311059313ac292ab658aa75e5a31f6220d395 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 1d71a65..7343d88 100644
+index 2ac69fa..54c5933 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1414,6 +1414,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1420,6 +1420,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          {
             return getHandle().locale;
          }
diff --git a/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch
index 5883f78a76..fae1d5e275 100644
--- a/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0087-Implement-Silenceable-Lightning-API.patch
@@ -1,4 +1,4 @@
-From 7dca647cde6af64bce68379982822bd9046224f4 Mon Sep 17 00:00:00 2001
+From 72c0d565077529a436c4cf03a62c6e8f9f65d17f 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
@@ -39,10 +39,10 @@ index d355e68..286fdef 100644
              //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
              float pitch = 0.8F + 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 a4d396d..a3e8d48 100644
+index fa593f3..2eac94c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1436,6 +1436,22 @@ public class CraftWorld implements World {
+@@ -1450,6 +1450,22 @@ public class CraftWorld implements World {
          {
              CraftWorld.this.playEffect( location, effect, 0 );
          }
diff --git a/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
index d11a889654..efdc5ec160 100644
--- a/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
+++ b/CraftBukkit-Patches/0131-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
@@ -1,4 +1,4 @@
-From 3e2a02539c547a3dfbab7666902681d5b0afbe4a Mon Sep 17 00:00:00 2001
+From 222279b067a8e701c7babcf32f8ea101105a2b4a Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 12:49:48 +0100
 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@@ -26,10 +26,10 @@ index 2121438..edcb307 100644
                  EntityOcelot entityocelot = new EntityOcelot(this.world);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a3e8d48..db0697b 100644
+index 2eac94c..89163ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1108,6 +1108,12 @@ public class CraftWorld implements World {
+@@ -1109,6 +1109,12 @@ public class CraftWorld implements World {
          }
  
          if (entity != null) {
@@ -39,9 +39,9 @@ index a3e8d48..db0697b 100644
 +                ( (EntityOcelot) entity ).spawnBonus = false;
 +            }
 +            // Spigot end
-             if (entity instanceof EntityInsentient) {
-                 ((EntityInsentient) entity).prepare(getHandle().E(new BlockPosition(entity)), (GroupDataEntity) null);
-             }
+             return entity;
+         }
+ 
 -- 
 2.1.4
 
diff --git a/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch
index bbb0a5faa3..26121ebe64 100644
--- a/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch
+++ b/CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch
@@ -1,4 +1,4 @@
-From 681c1beddeedb2f4123aa10b9a6e607014f2a75d Mon Sep 17 00:00:00 2001
+From c24a18a8fb71f125f0af50ff56b8f829fd723381 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 13:06:05 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -89,7 +89,7 @@ index 050c188..fd41124 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 653badd..3162541 100644
+index ba77235..d0312a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -19,6 +19,7 @@ import java.util.Set;
@@ -100,7 +100,7 @@ index 653badd..3162541 100644
  
  import net.minecraft.server.*;
  
-@@ -1435,6 +1436,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1441,6 +1442,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              return java.util.Collections.unmodifiableSet( ret );
          }