summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorTahg <tahgtahv@gmail.com>2011-06-01 18:35:57 -0400
committerTahg <tahgtahv@gmail.com>2011-06-01 18:35:57 -0400
commitebc478388cdde64dd5a4697f0ef8d7e36e1ec61c (patch)
treeb84857f95a50d231588c4fdeb0e1d1f93d5934d2 /src/main
parent66109d6e57047dbb5372c95c7e634c6f6167b402 (diff)
downloadcraftbukkit-ebc478388cdde64dd5a4697f0ef8d7e36e1ec61c.tar
craftbukkit-ebc478388cdde64dd5a4697f0ef8d7e36e1ec61c.tar.gz
craftbukkit-ebc478388cdde64dd5a4697f0ef8d7e36e1ec61c.tar.lz
craftbukkit-ebc478388cdde64dd5a4697f0ef8d7e36e1ec61c.tar.xz
craftbukkit-ebc478388cdde64dd5a4697f0ef8d7e36e1ec61c.zip
fixed cross world teleport
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 30f1b607..eded0b31 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -173,10 +173,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (oldWorld != newWorld) {
this.entity = manager.a(entity, newWorld.dimension, false);
- return true;
- } else {
- return entity.netServerHandler.teleport(location);
}
+ return entity.netServerHandler.teleport(location);
}
public void setSneaking(boolean sneak) {