summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/WorldServer.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2011-11-29 23:17:43 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2011-11-30 21:46:19 +0000
commit8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792 (patch)
treecc229f65097c54cfcd769f686c43efa1dacc8d2f /src/main/java/net/minecraft/server/WorldServer.java
parent8665161eaa0160467ce33598c13f1aed4b549a4d (diff)
downloadcraftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar
craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.gz
craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.lz
craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.xz
craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.zip
Updated to use mc-dev rename revision 1
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldServer.java')
-rw-r--r--src/main/java/net/minecraft/server/WorldServer.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 66b1cb38..8e333e1e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -20,7 +20,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
public boolean weirdIsOpCache = false;
public boolean savingDisabled;
public final MinecraftServer server; // CraftBukkit - private -> public final
- private EntityList N = new EntityList();
+ private IntHashMap N = new IntHashMap();
// CraftBukkit start - change signature
public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, String s, int i, WorldSettings worldsettings, org.bukkit.World.Environment env, ChunkGenerator gen) {
@@ -110,7 +110,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
}
protected IChunkProvider b() {
- IChunkLoader ichunkloader = this.B.a(this.worldProvider);
+ IChunkLoader ichunkloader = this.dataManager.createChunkLoader(this.worldProvider);
// CraftBukkit start
InternalChunkGenerator gen;
@@ -119,7 +119,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
gen = new CustomChunkGenerator(this, this.getSeed(), this.generator);
} else if (this.worldProvider instanceof WorldProviderHell) {
gen = new NetherChunkGenerator(this, this.getSeed());
- } else if (this.worldProvider instanceof WorldProviderSky) {
+ } else if (this.worldProvider instanceof WorldProviderTheEnd) {
gen = new SkyLandsChunkGenerator(this, this.getSeed());
} else {
gen = new NormalChunkGenerator(this, this.getSeed());
@@ -235,7 +235,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
}
public void saveLevel() {
- this.B.e();
+ this.dataManager.e();
}
protected void i() {