diff options
author | Erik Broes <erikbroes@grum.nl> | 2012-01-17 22:50:18 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2012-01-17 22:50:18 +0100 |
commit | 112e0816b9aa0b51db2a08010385d38d5a965cb3 (patch) | |
tree | ddab54c22ae2fcc16ed403480cfde78b95715350 /src | |
parent | f5f268f939a4acea62c01287451f205715d5dfd6 (diff) | |
download | craftbukkit-112e0816b9aa0b51db2a08010385d38d5a965cb3.tar craftbukkit-112e0816b9aa0b51db2a08010385d38d5a965cb3.tar.gz craftbukkit-112e0816b9aa0b51db2a08010385d38d5a965cb3.tar.lz craftbukkit-112e0816b9aa0b51db2a08010385d38d5a965cb3.tar.xz craftbukkit-112e0816b9aa0b51db2a08010385d38d5a965cb3.zip |
Actually close the inventory on a *cross*-world teleport.
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 81099584..e4f1b160 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -313,12 +313,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Check if the fromWorld and toWorld are the same. if (fromWorld == toWorld) { + entity.netServerHandler.teleport(to); + } else { // Close any foreign inventory if (getHandle().activeContainer != getHandle().defaultContainer){ getHandle().closeInventory(); } - entity.netServerHandler.teleport(to); - } else { server.getHandle().moveToWorld(entity, toWorld.dimension, true, to); } return true; |