diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-01 21:43:54 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-01 21:43:54 +0000 |
commit | 062d94d6bc8ecb42b28214bd8a91488aecc3409a (patch) | |
tree | be32201a87127557b99d18849c4501618e98f792 /src/main/java/net/minecraft/server/WorldServer.java | |
parent | 650717ad32a4294ecfff951c86a812d7b5b74974 (diff) | |
download | craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar.gz craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar.lz craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar.xz craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.zip |
Implemented 1.0.1 fixes. This fixes BUKKIT-3, BUKKIT-39, BUKKIT-150
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/WorldServer.java | 13 |
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); |