Implemented 1.0.1 fixes. This fixes BUKKIT-3, BUKKIT-39, BUKKIT-150

1 files changed, 12 insertions, 1 deletions

diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8e333e1e..adde7394 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -20,12 +20,15 @@ public class WorldServer extends World implements BlockChangeDelegate {
     public boolean weirdIsOpCache = false;
     public boolean savingDisabled;
     public final MinecraftServer server; // CraftBukkit - private -> public final
-    private IntHashMap N = new IntHashMap();
+    private IntHashMap N;
 
     // CraftBukkit start - change signature
     public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i, WorldSettings worldsettings, org.bukkit.World.Environment env, ChunkGenerator gen) {
         super(idatamanager, s, worldsettings, WorldProvider.byDimension(env.getId()), gen, env);
         this.server = minecraftserver;
+        if (this.N == null) {
+            this.N = new IntHashMap();
+        }
 
         this.dimension = i;
         this.pvpMode = minecraftserver.pvpMode;
@@ -157,6 +160,14 @@ public class WorldServer extends World implements BlockChangeDelegate {
         return i1 > this.getServer().getSpawnRadius() || this.server.serverConfigurationManager.isOp(entityhuman.name);
     }
 
+    protected void c() {
+        if (this.N == null) {
+            this.N = new IntHashMap();
+        }
+
+        super.c();
+    }
+
     protected void c(Entity entity) {
         super.c(entity);
         this.N.a(entity.id, entity);