diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
index e35c1085..41528c9a 100644
--- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From d713466b361d7e41abd9db3e7e5dfcf60aba7d0b Mon Sep 17 00:00:00 2001
+From ebbe28041140a818e04e61955eed5786b72723a8 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 a793b8f..a01abcc 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3ee0b91..9b02bd9 100644
+index 2fe3eae..8aab1a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1525,4 +1525,14 @@ public class CraftWorld implements World {
+@@ -1477,4 +1477,14 @@ public class CraftWorld implements World {
              cps.unload(chunk);
          }
      }
diff --git a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch
index f43e22ed..de67e9cb 100644
--- a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch
@@ -1,4 +1,4 @@
-From 5ef8832895dc761850ef696c71de13942dd5bfc8 Mon Sep 17 00:00:00 2001
+From 42a71f88111570d72dc962044a8c98afc9b08a03 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
@@ -26,7 +26,7 @@ index 8eebac1..a106e44 100644
      public int a(Random random) {
          return 1;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fdb3417..854b39f 100644
+index 85e8d3d..5b966f7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -636,6 +636,7 @@ public abstract class EntityLiving extends Entity {
@@ -106,7 +106,7 @@ index d29cd04..efe4d18 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 b5de92d..e0a63d4 100644
+index 8aab1a7..d6a39c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -170,6 +170,7 @@ public class CraftWorld implements World {
@@ -125,7 +125,7 @@ index b5de92d..e0a63d4 100644
          if (isChunkInUse(x, z)) {
              return false;
          }
-@@ -269,6 +271,7 @@ public class CraftWorld implements World {
+@@ -253,6 +255,7 @@ public class CraftWorld implements World {
      }
  
      public boolean loadChunk(int x, int z, boolean generate) {
@@ -134,7 +134,7 @@ index b5de92d..e0a63d4 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 1e84c57..8dfdff5 100644
+index b82b6b0..85b099a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -211,6 +211,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch
index e30e33ec..36644865 100644
--- a/CraftBukkit-Patches/0010-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch
@@ -1,4 +1,4 @@
-From 7889fb597e3cab353b8deb7b581116fb2062c0eb Mon Sep 17 00:00:00 2001
+From 614dae9d6eda3b659ecfeff1fadda63451bfb522 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,18 +6,18 @@ 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 45794e9..7a26472 100644
+index ead421a..38f303d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -839,6 +839,7 @@ public class Chunk {
-     }
+@@ -842,6 +842,7 @@ public class Chunk {
  
-     public void loadNearby(IChunkProvider ichunkprovider, ChunkGenerator chunkgenerator) {
+     // CraftBukkit start
+     public void loadNearby(IChunkProvider ichunkprovider, ChunkGenerator chunkgenerator, boolean newChunk) {
 +        world.timings.syncChunkLoadPostTimer.startTiming(); // Spigot
-         Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1);
-         Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ);
-         Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1);
-@@ -863,6 +864,7 @@ public class Chunk {
+         Server server = world.getServer();
+         if (server != null) {
+             /*
+@@ -892,6 +893,7 @@ public class Chunk {
                  chunk4.a(chunkgenerator);
              }
          }
@@ -26,10 +26,10 @@ index 45794e9..7a26472 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9e99992..a82bfdb 100644
+index 1703382..2a604c6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -154,6 +154,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -152,6 +152,7 @@ public class ChunkProviderServer implements IChunkProvider {
          // CraftBukkit end
  
          if (chunk == null) {
@@ -37,16 +37,16 @@ index 9e99992..a82bfdb 100644
              long k = ChunkCoordIntPair.a(i, j);
  
              try {
-@@ -199,6 +200,7 @@ public class ChunkProviderServer implements IChunkProvider {
-             }
-             // CraftBukkit end
-             chunk.loadNearby(this, this.chunkGenerator);
+@@ -170,6 +171,7 @@ public class ChunkProviderServer implements IChunkProvider {
+             chunk.addEntities();
+ 
+             chunk.loadNearby(this, this.chunkGenerator, true); // CraftBukkit
 +            world.timings.syncChunkLoadTimer.stopTiming(); // Spigot
          }
  
          return chunk;
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index d91f8c7..2180403 100644
+index 362d2b7..06f0768 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -46,7 +46,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -59,7 +59,7 @@ index d91f8c7..2180403 100644
          if (data != null) {
              Chunk chunk = (Chunk) data[0];
              NBTTagCompound nbttagcompound = (NBTTagCompound) data[1];
-@@ -384,7 +386,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -385,7 +387,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
      public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
          // CraftBukkit end
@@ -68,7 +68,7 @@ index d91f8c7..2180403 100644
          NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
  
          if (nbttaglist1 != null) {
-@@ -395,7 +397,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -396,7 +398,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  chunk.g(true);
              }
          }
@@ -78,7 +78,7 @@ index d91f8c7..2180403 100644
          NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10);
  
          if (nbttaglist2 != null) {
-@@ -408,6 +411,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -409,6 +412,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -87,7 +87,7 @@ index d91f8c7..2180403 100644
  
          if (nbttagcompound.hasKeyOfType("TileTicks", 9)) {
              NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10);
-@@ -427,6 +432,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -428,6 +433,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -124,7 +124,7 @@ index 205f943..2211d45 100644
  
      public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 23590ac..7338524 100644
+index fa2853a..7114925 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,6 +24,7 @@ import org.bukkit.block.BlockFace;
@@ -356,10 +356,10 @@ index 046d47c..7014450 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 b33aa21..de5df2f 100644
+index 9946fb7..7bb61f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1280,6 +1280,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1283,6 +1283,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -367,7 +367,7 @@ index b33aa21..de5df2f 100644
         // CraftBukkit start - whole method
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
  
-@@ -1289,18 +1290,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1292,18 +1293,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -589,20 +589,6 @@ index f609035..b09cd94 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 fffb093..6f36594 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -282,7 +282,9 @@ public class CraftWorld implements World {
-         net.minecraft.server.Chunk chunk = world.getChunkProviderServer().chunks.get(ChunkCoordIntPair.a(x, z));
- 
-         if (chunk == null) {
-+            world.timings.syncChunkLoadTimer.startTiming(); // Spigot
-             chunk = world.getChunkProviderServer().getOrLoadChunkAt(x, z);
-+            world.timings.syncChunkLoadTimer.stopTiming(); // Spigot
-         }
-         return chunk != null;
-     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 new file mode 100644
 index 0000000..558574f
@@ -780,7 +766,7 @@ index 0000000..558574f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 1632f13..7b61b14 100644
+index f1c1dc4..3a95b44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -45,7 +45,9 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
@@ -792,7 +778,7 @@ index 1632f13..7b61b14 100644
 +            queuedChunk.provider.world.timings.syncChunkLoadStructuresTimer.stopTiming(); // Spigot
          }
  
-         Server server = queuedChunk.provider.world.getServer();
+         chunk.loadNearby(queuedChunk.provider, queuedChunk.provider.chunkGenerator, false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 index 9fea4fb..8442ecb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
diff --git a/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch
index a28c280a..d62004cf 100644
--- a/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch
+++ b/CraftBukkit-Patches/0011-Fix-Mob-Spawning-Relative-to-View-Distance.patch
@@ -1,4 +1,4 @@
-From 3da926e39fab01b03f010b294bb69ab8cf7400c6 Mon Sep 17 00:00:00 2001
+From 09134b57f58e97ccb7c6924698eac50b05dd0a44 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@@ -8,7 +8,7 @@ Changes the mob spawning algorithm to properly account for view distance and the
 Needs better documentation.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7a26472..424a0ef 100644
+index 38f303d..4fc5848 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -44,6 +44,7 @@ public class Chunk {
@@ -19,7 +19,7 @@ index 7a26472..424a0ef 100644
  
      // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
      private int neighbors = 0x1 << 12;
-@@ -606,6 +607,22 @@ public class Chunk {
+@@ -608,6 +609,22 @@ public class Chunk {
          entity.ad = k;
          entity.ae = this.locZ;
          this.entitySlices[k].add(entity);
@@ -42,7 +42,7 @@ index 7a26472..424a0ef 100644
      }
  
      public void b(Entity entity) {
-@@ -622,6 +639,22 @@ public class Chunk {
+@@ -624,6 +641,22 @@ public class Chunk {
          }
  
          this.entitySlices[i].remove(entity);
diff --git a/CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch
index 6398ebf3..2d6bdc18 100644
--- a/CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch
@@ -1,14 +1,14 @@
-From 82363eba7654083bf0a188eba17b69388749fc63 Mon Sep 17 00:00:00 2001
+From ca99bb3b29cf011d9b1e4d8219e80466432eb694 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 d08f621..12af237 100644
+index 7bb61f0..2ea930b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1282,6 +1282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1285,6 +1285,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
     private void handleCommand(String s) {
          org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
         // CraftBukkit start - whole method
diff --git a/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
index 8025aa42..0646bf71 100644
--- a/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
+++ b/CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
@@ -1,14 +1,14 @@
-From 6c96f1a97546078d73bf056287a592966d64cc2e Mon Sep 17 00:00:00 2001
+From cba8fb19f39a2f4742ed561e0c91fbe2136b34c4 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 424a0ef..b1fd77d 100644
+index 4fc5848..b71c4ed 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -972,7 +972,7 @@ public class Chunk {
+@@ -1001,7 +1001,7 @@ public class Chunk {
          }
  
          this.r = true;
diff --git a/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch b/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch
index 3f4db335..370e3ab3 100644
--- a/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch
+++ b/CraftBukkit-Patches/0030-Properly-Close-Inventories.patch
@@ -1,4 +1,4 @@
-From 7cc3fadf5111991be1c5a400542304488d8f9aff Mon Sep 17 00:00:00 2001
+From c4ae1780f184369225e99944d7716d534cc06d95 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,10 +6,10 @@ 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 b1fd77d..e9c2400 100644
+index b71c4ed..b49fda1 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -759,6 +759,18 @@ public class Chunk {
+@@ -761,6 +761,18 @@ public class Chunk {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -28,7 +28,7 @@ index b1fd77d..e9c2400 100644
  
              this.world.b(tileentity);
          }
-@@ -772,6 +784,18 @@ public class Chunk {
+@@ -774,6 +786,18 @@ public class Chunk {
              java.util.Iterator<Entity> iter = newList.iterator();
              while (iter.hasNext()) {
                  Entity entity = iter.next();
diff --git a/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch b/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch
index 32148ef0..1c88ca2c 100644
--- a/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch
+++ b/CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch
@@ -1,14 +1,14 @@
-From 87c126192b2087f6a4fa3f66b24657f14417764b Mon Sep 17 00:00:00 2001
+From 3a62cc6b69b13c5a5e02486564f1d48017614ef5 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 12af237..244f4c7 100644
+index 2ea930b..f6a7a57 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1443,6 +1443,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1446,6 +1446,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          if (this.player.dead) return; // CraftBukkit
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = packetplayinuseentity.a((World) worldserver);
diff --git a/CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch b/CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch
index a7036da8..c4a5432b 100644
--- a/CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch
+++ b/CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch
@@ -1,11 +1,11 @@
-From 759776c4cdad028bd6cfa8a4e715de511849e9b0 Mon Sep 17 00:00:00 2001
+From f3360dd3b177f01ddfb14d873554be12a0fb181d 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 244f4c7..7caf0c5 100644
+index f6a7a57..5817601 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -125,6 +125,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -16,7 +16,7 @@ index 244f4c7..7caf0c5 100644
  
      public CraftPlayer getPlayer() {
          return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
-@@ -352,6 +353,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -355,6 +356,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
                  // CraftBukkit start - fire PlayerMoveEvent
                  Player player = this.getPlayer();
@@ -35,7 +35,7 @@ index 244f4c7..7caf0c5 100644
                  Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
                  Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
  
-@@ -377,7 +390,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -380,7 +393,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      this.lastPitch = to.getPitch();
  
                      // Skip the first time we do this
diff --git a/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch b/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch
index 6cb6dc3a..fa94f618 100644
--- a/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch
+++ b/CraftBukkit-Patches/0045-Fix-some-chunks-not-being-sent-to-the-client.patch
@@ -1,14 +1,14 @@
-From cd4ea124b50c1fb4b5305b94548f1f0de72b08ea Mon Sep 17 00:00:00 2001
+From 66e30a72988fada1412d5477ca0f27776eb72654 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 e9c2400..719effb 100644
+index b49fda1..0baf90d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1014,7 +1014,15 @@ public class Chunk {
+@@ -1043,7 +1043,15 @@ public class Chunk {
      }
  
      public boolean isReady() {
diff --git a/CraftBukkit-Patches/0053-Particle-API.patch b/CraftBukkit-Patches/0053-Particle-API.patch
index 7dc4e662..46fd5fa2 100644
--- a/CraftBukkit-Patches/0053-Particle-API.patch
+++ b/CraftBukkit-Patches/0053-Particle-API.patch
@@ -1,4 +1,4 @@
-From 75d65a8accd5fbc369b4c561e5f3b6665b19f254 Mon Sep 17 00:00:00 2001
+From 2a5f3439fa956d728b690820390f0d13ae640ea4 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 1672183..352ff3a 100644
              datavalue = 0;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6f36594..427c842 100644
+index d6a39c9..b079d46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -877,28 +877,18 @@ public class CraftWorld implements World {
+@@ -827,28 +827,18 @@ public class CraftWorld implements World {
              Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
          }
  
@@ -60,7 +60,7 @@ index 6f36594..427c842 100644
      }
  
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
-@@ -1533,6 +1523,70 @@ public class CraftWorld implements World {
+@@ -1483,6 +1473,70 @@ public class CraftWorld implements World {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {
diff --git a/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch
index 7563d78a..13e59c62 100644
--- a/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch
@@ -1,4 +1,4 @@
-From 87bb1fc11fbe58ff1aaacb92188733ce7312c82d Mon Sep 17 00:00:00 2001
+From 9144ddcb6cddf47aa763d88cd76d183bf39805fa 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
@@ -11,10 +11,10 @@ Instead we will mimic the save-all command in its behaviour, which is both safe
 Also, only save modified chunks, or chunks with entities after 4 auto save passes
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 719effb..701fc56 100644
+index 0baf90d..1376bee 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -880,7 +880,7 @@ public class Chunk {
+@@ -882,7 +882,7 @@ public class Chunk {
              if (this.t && this.world.getTime() != this.lastSaved || this.s) {
                  return true;
              }
@@ -24,10 +24,10 @@ index 719effb..701fc56 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a82bfdb..fe50511 100644
+index 2a604c6..2ee5c92 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -261,7 +261,7 @@ public class ChunkProviderServer implements IChunkProvider {
+@@ -232,7 +232,7 @@ public class ChunkProviderServer implements IChunkProvider {
                  this.saveChunk(chunk);
                  chunk.f(false);
                  ++i;
@@ -60,10 +60,10 @@ index ab4d50d..954d9bf 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 427c842..b494ac8 100644
+index b079d46..39ed7d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -781,12 +781,17 @@ public class CraftWorld implements World {
+@@ -731,12 +731,17 @@ public class CraftWorld implements World {
      }
  
      public void save() {
diff --git a/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch b/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch
index 2886546a..e5293a64 100644
--- a/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch
+++ b/CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch
@@ -1,14 +1,14 @@
-From 8cf391a4cf1ffd1bf0e5640d7a21bee3343e691a Mon Sep 17 00:00:00 2001
+From 50164240186aded4bb19b38447d8cf1f5263b185 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 7caf0c5..a586553 100644
+index 5817601..17e4acb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1188,9 +1188,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1191,9 +1191,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
              }
  
diff --git a/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch
index cba1a305..6393357c 100644
--- a/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch
+++ b/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch
@@ -1,14 +1,14 @@
-From 6ec8fd018a759349ca09d034968516a4d7905bbc Mon Sep 17 00:00:00 2001
+From 1e2e5a3ea37f0d00116d8e5f62ef66a3bb1896cf 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 a586553..60ce822 100644
+index 17e4acb..1f40f27 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1950,7 +1950,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1953,7 +1953,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
              boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() <= 45;
              // CraftBukkit - Add invalidItems check
diff --git a/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch
index 95db56b4..84cbbd5a 100644
--- a/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch
@@ -1,4 +1,4 @@
-From cce0f14925e4a315cd70052a657cd2cfb8654547 Mon Sep 17 00:00:00 2001
+From 985649a677015fbd1d855d6c6dd3817f462ba3cb 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
@@ -40,10 +40,10 @@ index 79f640a..f2691d9 100644
              // this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dn, SoundCategory.WEATHER, 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 da432d3..7075ad8 100644
+index 39ed7d6..e8738ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1592,6 +1592,22 @@ public class CraftWorld implements World {
+@@ -1542,6 +1542,22 @@ public class CraftWorld implements World {
          {
              CraftWorld.this.playEffect( location, effect, 0 );
          }
diff --git a/CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch
index f5a7ff7c..484f0334 100644
--- a/CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch
+++ b/CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch
@@ -1,11 +1,11 @@
-From 09655c696832d0cb120b47acae95b5989d06dc4a Mon Sep 17 00:00:00 2001
+From 57b29f339bf8f79f5634ab73d1351aebb77a312b 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!
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3b2d552..7766f36 100644
+index 4427af9..6ac7f42 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -262,7 +262,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,10 +27,10 @@ index 3b2d552..7766f36 100644
              f1 = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 60ce822..0865271 100644
+index 1f40f27..937adcf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1111,7 +1111,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1114,7 +1114,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              this.player.resetIdleTimer();
          } else {
              PlayerConnection.LOGGER.warn("{} tried to set an invalid carried item", new Object[] { this.player.getName()});
diff --git a/CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch
index ae46a06c..2dc9cb7e 100644
--- a/CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch
+++ b/CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch
@@ -1,4 +1,4 @@
-From 2eddb7c9e2ec11a5a237ba88e51af179465f26c7 Mon Sep 17 00:00:00 2001
+From af756c2d7392a9b27b5ae43b569873caaecdc7bc Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0865271..124a244 100644
+index 937adcf..cc19d79 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1173,7 +1173,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1176,7 +1176,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              } else if (s.isEmpty()) {
                  LOGGER.warn(this.player.getName() + " tried to send an empty message");
              } else if (getPlayer().isConversing()) {
diff --git a/CraftBukkit-Patches/0111-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0111-Limit-block-placement-interaction-packets.patch
index 9eeb2301..46ee28e2 100644
--- a/CraftBukkit-Patches/0111-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0111-Limit-block-placement-interaction-packets.patch
@@ -1,4 +1,4 @@
-From 59e6b1ac807515fe4bf8be6151c5fabfe5d7005e Mon Sep 17 00:00:00 2001
+From 92eb8cf98d351aa5c99963a660b25cb476b13082 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets
@@ -41,10 +41,10 @@ index cb0356e..0000000
 -    }
 -}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 124a244..41aa119 100644
+index cc19d79..0d7ed57 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -896,6 +896,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -899,6 +899,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      }
  
@@ -55,7 +55,7 @@ index 124a244..41aa119 100644
      public void a(PacketPlayInBlockPlace packetplayinblockplace) {
          PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.x());
          if (this.player.dead) return; // CraftBukkit
-@@ -904,7 +908,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -907,7 +911,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          ItemStack itemstack = this.player.b(enumhand);
  
          this.player.resetIdleTimer();
diff --git a/CraftBukkit-Patches/0119-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0119-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
index f86fb161..32269246 100644
--- a/CraftBukkit-Patches/0119-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
+++ b/CraftBukkit-Patches/0119-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
@@ -1,4 +1,4 @@
-From c6b72e59a6068c14fd5f7f4e3b7d302f5ea35896 Mon Sep 17 00:00:00 2001
+From da80c286d877b865492151e6bd3be61491c2e320 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 a879f3f..149bd01 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 7075ad8..4eacee7 100644
+index e8738ee..56bdcb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1170,6 +1170,12 @@ public class CraftWorld implements World {
+@@ -1120,6 +1120,12 @@ public class CraftWorld implements World {
          }
  
          if (entity != null) {
diff --git a/CraftBukkit-Patches/0121-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0121-Make-moved-wrongly-limit-configurable.patch
index c469ee0b..a9af03bb 100644
--- a/CraftBukkit-Patches/0121-Make-moved-wrongly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0121-Make-moved-wrongly-limit-configurable.patch
@@ -1,14 +1,14 @@
-From 00b64106446c7e348a5aadf791d5c736d82f7f56 Mon Sep 17 00:00:00 2001
+From 532931ecc96a640d80539317963d7d3b56ff52d9 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 41aa119..dd745fc 100644
+index 0d7ed57..1422d65 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -337,7 +337,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -340,7 +340,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  d10 = d6 * d6 + d7 * d7 + d8 * d8;
                  boolean flag1 = false;
  
@@ -17,7 +17,7 @@ index 41aa119..dd745fc 100644
                      flag1 = true;
                      PlayerConnection.LOGGER.warn("{} moved wrongly!", new Object[] { entity.getName()});
                  }
-@@ -552,7 +552,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -555,7 +555,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          d11 = d7 * d7 + d8 * d8 + d9 * d9;
                          boolean flag1 = false;
  
diff --git a/CraftBukkit-Patches/0123-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0123-Make-moved-too-quickly-limit-configurable.patch
index f01c7e81..c401975a 100644
--- a/CraftBukkit-Patches/0123-Make-moved-too-quickly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0123-Make-moved-too-quickly-limit-configurable.patch
@@ -1,14 +1,14 @@
-From 4f66761b277d0da78c0439d9b19f95725d2b88bd Mon Sep 17 00:00:00 2001
+From 723e568dfb37283a3d324d1ece342a079e3a9e8a Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dd745fc..85b9bf4 100644
+index 1422d65..ba8a69a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -312,7 +312,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -315,7 +315,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
                  speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
  
@@ -17,7 +17,7 @@ index dd745fc..85b9bf4 100644
                  // CraftBukkit end
                      PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", new Object[] { entity.getName(), this.player.getName(), Double.valueOf(d6), Double.valueOf(d7), Double.valueOf(d8)});
                      this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
-@@ -521,7 +521,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -524,7 +524,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          if (!this.player.K() && (!this.player.x().getGameRules().getBoolean("disableElytraMovementCheck") || !this.player.cG())) {
                              float f2 = this.player.cG() ? 300.0F : 100.0F;
  
diff --git a/CraftBukkit-Patches/0139-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0139-Use-Standard-List-for-EntitySlices.patch
index 2f446615..35272baa 100644
--- a/CraftBukkit-Patches/0139-Use-Standard-List-for-EntitySlices.patch
+++ b/CraftBukkit-Patches/0139-Use-Standard-List-for-EntitySlices.patch
@@ -1,11 +1,11 @@
-From 85f2488add242075a039ba078261236c5fdf2f38 Mon Sep 17 00:00:00 2001
+From 25e86222ff6da4936ed58923869a2a67dd567d83 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:33:36 +1100
 Subject: [PATCH] Use Standard List for EntitySlices.
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 701fc56..9343615 100644
+index 1376bee..4542987 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -32,7 +32,7 @@ public class Chunk {
@@ -17,7 +17,7 @@ index 701fc56..9343615 100644
      private boolean done;
      private boolean lit;
      private boolean r;
-@@ -82,14 +82,14 @@ public class Chunk {
+@@ -83,14 +83,14 @@ public class Chunk {
          this.tileEntities = Maps.newHashMap();
          this.x = 4096;
          this.y = Queues.newConcurrentLinkedQueue();
@@ -34,7 +34,7 @@ index 701fc56..9343615 100644
          }
  
          Arrays.fill(this.h, -999);
-@@ -742,11 +742,11 @@ public class Chunk {
+@@ -744,11 +744,11 @@ public class Chunk {
      public void addEntities() {
          this.j = true;
          this.world.b(this.tileEntities.values());
@@ -48,7 +48,7 @@ index 701fc56..9343615 100644
  
              this.world.a((Collection) entityslice);
          }
-@@ -775,7 +775,7 @@ public class Chunk {
+@@ -777,7 +777,7 @@ public class Chunk {
              this.world.b(tileentity);
          }
  
@@ -57,7 +57,7 @@ index 701fc56..9343615 100644
          int i = aentityslice.length;
  
          for (int j = 0; j < i; ++j) {
-@@ -862,12 +862,12 @@ public class Chunk {
+@@ -864,12 +864,12 @@ public class Chunk {
          j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
  
          for (int k = i; k <= j; ++k) {
@@ -72,7 +72,7 @@ index 701fc56..9343615 100644
                      list.add((T) entity); // Fix decompile error
                  }
              }
-@@ -1259,7 +1259,7 @@ public class Chunk {
+@@ -1288,7 +1288,7 @@ public class Chunk {
          return this.tileEntities;
      }
  
diff --git a/CraftBukkit-Patches/0145-Clear-Packet-Queue-on-Disconnect.patch b/CraftBukkit-Patches/0145-Clear-Packet-Queue-on-Disconnect.patch
index 11422b67..edcee170 100644
--- a/CraftBukkit-Patches/0145-Clear-Packet-Queue-on-Disconnect.patch
+++ b/CraftBukkit-Patches/0145-Clear-Packet-Queue-on-Disconnect.patch
@@ -1,4 +1,4 @@
-From 17d31a004f488025df838ee11dc181079767f5a9 Mon Sep 17 00:00:00 2001
+From 3024ac9947bc2fedc51c2085e83f694e3ff5939a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 22 Jul 2015 19:04:37 +1000
 Subject: [PATCH] Clear Packet Queue on Disconnect
@@ -17,10 +17,10 @@ index 8abf323..d59fca4 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 85b9bf4..19be56f 100644
+index ba8a69a..d1e2fdc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1082,7 +1082,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1085,7 +1085,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          // CraftBukkit start