summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/MinecraftServer.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-08-24 19:51:51 -0500
committerEvilSeph <evilseph@gmail.com>2012-08-25 00:54:21 -0400
commitb8cc86208310513232e27d543ec9b6c153ab1421 (patch)
tree0d7d772e5bb878b189fd4c5bd74c84878aaf088d /src/main/java/net/minecraft/server/MinecraftServer.java
parent35cff16da572292785201dfb683413623efd0a43 (diff)
downloadcraftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar.gz
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar.lz
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar.xz
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.zip
Update to 1.3.2
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 21545ca9..6529ff80 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -304,7 +304,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
if (worldserver != null) {
if (!flag) {
- log.info("Saving chunks for level \'" + worldserver.getWorldData().getName() + "\'/" + worldserver.worldProvider);
+ log.info("Saving chunks for level \'" + worldserver.getWorldData().getName() + "\'/" + worldserver.worldProvider.getName());
worldserver.save(true, (IProgressUpdate) null); // Perform a full save
} else {
worldserver.save(false, (IProgressUpdate) null); // Queue chunk saving
@@ -561,10 +561,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
while (true) {
if (!worldserver.updateLights()) {
// this.methodProfiler.b(); // CraftBukkit - not in production code
- if (true || !worldserver.players.isEmpty()) { // CraftBukkit - this prevents entity cleanup, other issue on servers with no players
- worldserver.tickEntities();
- }
-
+ worldserver.tickEntities();
// this.methodProfiler.a("tracker"); // CraftBukkit - not in production code
worldserver.getTracker().updatePlayers();
// this.methodProfiler.b(); // CraftBukkit - not in production code
@@ -691,7 +688,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
}
if (flag) {
- dedicatedserver.aj();
+ dedicatedserver.ak();
}
*/
@@ -744,7 +741,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
}
public String getVersion() {
- return "1.3.1";
+ return "1.3.2";
}
public int x() {