Upstream Merge

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

CraftBukkit-Patches/0069-Guard-entity-list.patch

@@ -1,14 +1,14 @@
-From 9acd15599ac94ac59fb7f387d299663b10d60afc Mon Sep 17 00:00:00 2001
+From a8c4b252bda955ac01b33f738537bbe645d9482a Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 3 Aug 2013 21:42:00 +0500
 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 15117e5..37d6e1a 100644
+index 52694f1..f06a8df 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -29,7 +29,25 @@ import java.util.concurrent.Callable;
+@@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
  public abstract class World implements IBlockAccess {
  
      public boolean d;
@@ -70,5 +70,5 @@ index 15117e5..37d6e1a 100644
          timings.entityTick.stopTiming(); // Spigot
          this.methodProfiler.c("tileEntities");
 -- 
-1.8.1.msysgit.1
+1.8.1.2