diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index eded0b3130..4d6fe88c55 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -170,11 +170,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         WorldServer newWorld = ((CraftWorld)location.getWorld()).getHandle();
         ServerConfigurationManager manager = server.getHandle();
         EntityPlayer entity = getHandle();
+        boolean successfulTeleport = entity.netServerHandler.teleport(location);
 
-        if (oldWorld != newWorld) {
+        if (oldWorld != newWorld && successfulTeleport) {
             this.entity = manager.a(entity, newWorld.dimension, false);
         }
-        return entity.netServerHandler.teleport(location);
+        return successfulTeleport;
     }
 
     public void setSneaking(boolean sneak) {