summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/MinecraftServer.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-09-24 22:03:31 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-09-24 22:05:22 +0100
commit0118a20d6a4d5637504b26998bfd96c7a65ddbe1 (patch)
tree3015971c8bd61d17e7da8f00d4b3b5db01f7e9b3 /src/main/java/net/minecraft/server/MinecraftServer.java
parent75ac4e00b27d05627a3c4ffde7879a37dd612d02 (diff)
downloadcraftbukkit-0118a20d6a4d5637504b26998bfd96c7a65ddbe1.tar
craftbukkit-0118a20d6a4d5637504b26998bfd96c7a65ddbe1.tar.gz
craftbukkit-0118a20d6a4d5637504b26998bfd96c7a65ddbe1.tar.lz
craftbukkit-0118a20d6a4d5637504b26998bfd96c7a65ddbe1.tar.xz
craftbukkit-0118a20d6a4d5637504b26998bfd96c7a65ddbe1.zip
Update to mcdev rename revision 01 for 1.8.1
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1fc7940f..cff20b59 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -229,9 +229,9 @@ public class MinecraftServer implements Runnable, ICommandListener {
world.tracker = new EntityTracker(this, dimension);
world.addIWorldAccess(new WorldManager(this, world));
- world.spawnMonsters = this.propertyManager.getInt("difficulty", 1);
+ world.difficulty = this.propertyManager.getInt("difficulty", 1);
world.setSpawnFlags(this.propertyManager.getBoolean("spawn-monsters", true), this.spawnAnimals);
- world.p().d(j);
+ world.p().setGameType(j);
this.worlds.add(world);
this.serverConfigurationManager.setPlayerFileData(this.worlds.toArray(new WorldServer[0]));
}
@@ -312,7 +312,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
}
WorldServer world = this.worlds.get(0);
- if (!world.canSave) {
+ if (!world.savingDisabled) {
this.serverConfigurationManager.savePlayers();
}
// CraftBukkit end
@@ -339,7 +339,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
// CraftBukkit end
}
- public void a() {
+ public void safeShutdown() {
this.isRunning = false;
}
@@ -464,7 +464,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
;
}
- worldserver.cleanUp();
+ worldserver.tickEntities();
}
// } // CraftBukkit