Updated to use mc-dev rename revision 1

This commit is contained in:
Nathan Adams
2011-11-29 23:17:43 +00:00
parent 8665161eaa
commit 8fbe78a2c3
117 changed files with 907 additions and 1161 deletions

View File

@@ -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() {