Upstream Merge

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0034-Improve-NextTickList-Performance.patch

@@ -1,4 +1,4 @@
-From 271f0e350784d53e752a939d5fba64d6e90d3402 Mon Sep 17 00:00:00 2001
+From 131db6fa5dabe5cc1563b6b57fb98a4d44b63030 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 24 Apr 2013 01:43:33 -0500
 Subject: [PATCH] Improve NextTickList Performance
@@ -20,7 +20,7 @@ index acf8838..1e3e0f8 100644
  
      public NextTickListEntry a(long i) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c1239f1..588c630 100644
+index 3afcc0e..5eb335f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -25,8 +25,8 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -245,7 +245,7 @@ index c1239f1..588c630 100644
  
          this.b(worldsettings);
          super.a(worldsettings);
-@@ -991,4 +969,62 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
+@@ -995,4 +973,62 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
          return this.setTypeIdAndData(x, y, z, typeId, data, 3);
      }
      // CraftBukkit end
@@ -309,5 +309,5 @@ index c1239f1..588c630 100644
 +    // Spigot end 
  }
 -- 
-1.8.1.2
+1.8.3.2