diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-25 20:54:29 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-25 20:54:29 +0000 |
| commit | 197fdbd84c49db6cad3cbebf636739b491d5cdd0 (patch) | |
| tree | 02dd43da38d35120cfd7db9865b8c6d0fdec26bc /src/main/java/net/minecraft | |
| parent | bb16e6c5c16675e2523e1e375b24e0313d18a0a9 (diff) | |
| download | craftbukkit-197fdbd84c49db6cad3cbebf636739b491d5cdd0.tar craftbukkit-197fdbd84c49db6cad3cbebf636739b491d5cdd0.tar.gz craftbukkit-197fdbd84c49db6cad3cbebf636739b491d5cdd0.tar.lz craftbukkit-197fdbd84c49db6cad3cbebf636739b491d5cdd0.tar.xz craftbukkit-197fdbd84c49db6cad3cbebf636739b491d5cdd0.zip | |
Nether portals should now only work in the default world
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 000ea0f0..81398a6c 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -320,7 +320,7 @@ public class ServerConfigurationManager { Location toLocation = null; if (toWorld != null) { - if ((dimension == -1) || (dimension == 0)) { + if (((dimension == -1) || (dimension == 0)) && ((entityplayer.dimension == -1) || (entityplayer.dimension == 0))) { double blockRatio = dimension == 0 ? 8 : 0.125; toLocation = toWorld == null ? null : new Location(toWorld.getWorld(), (entityplayer.locX * blockRatio), entityplayer.locY, (entityplayer.locZ * blockRatio), entityplayer.yaw, entityplayer.pitch); |