summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/MinecraftServer.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-12 19:43:34 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-12 19:43:34 +0100
commit7d0e739f96d51197e8f7dd5acd7b950b2f598670 (patch)
tree0b2332a04109adc25091cf92fbe9531a0872edfd /src/main/java/net/minecraft/server/MinecraftServer.java
parent897551e39e0e24812acc0704e963d347dfa4a8ef (diff)
downloadcraftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar
craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar.gz
craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar.lz
craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.tar.xz
craftbukkit-7d0e739f96d51197e8f7dd5acd7b950b2f598670.zip
Fix balance of CraftBukkit start/end.
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e37b56de..a2831995 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -206,7 +206,6 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
j = WorldSettings.a(j);
log.info("Default game type: " + j);
-
// CraftBukkit start (+ removed worldsettings and servernbtmanager)
int worldCount = 3;
@@ -223,13 +222,12 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
}
if (k == 2) {
- // CraftBukkit start (+ don't do this in server.properties, do it in bukkit.yml)
+ // CraftBukkit - (+ don't do this in server.properties, do it in bukkit.yml)
if (this.server.getAllowEnd()) {
dimension = 1;
} else {
continue;
}
- // CraftBukkit end
}
String worldType = Environment.getEnvironment(dimension).toString().toLowerCase();