diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-12-09 18:55:36 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-12-09 18:55:36 +0100 |
commit | f7649724fec56980b526e4d7fe4e9908df532740 (patch) | |
tree | 6da1330910e4613f751f79513063040fad71e6d0 /src/main/java/net/minecraft/server/MinecraftServer.java | |
parent | d36ac82c839cec0955e61891a271d12e91e2fa0d (diff) | |
download | craftbukkit-f7649724fec56980b526e4d7fe4e9908df532740.tar craftbukkit-f7649724fec56980b526e4d7fe4e9908df532740.tar.gz craftbukkit-f7649724fec56980b526e4d7fe4e9908df532740.tar.lz craftbukkit-f7649724fec56980b526e4d7fe4e9908df532740.tar.xz craftbukkit-f7649724fec56980b526e4d7fe4e9908df532740.zip |
Implemented CraftServer.getAllowEnd(). Thanks codename-B!
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/MinecraftServer.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 91ea00d4..d840216c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -223,7 +223,13 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe } if (k == 2) { - dimension = 1; + // CraftBukkit start (+ 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(); |