From 993e19b3fbaef793914f047a9ca6e8c2800c5988 Mon Sep 17 00:00:00 2001 From: Andrzej Pomirski Date: Sat, 9 Feb 2013 23:38:53 +0100 Subject: Close inventory on teleport. FIXES BUKKIT-3021. --- src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index b0c23a06..f8dbbee7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -381,14 +381,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { WorldServer fromWorld = ((CraftWorld) from.getWorld()).getHandle(); WorldServer toWorld = ((CraftWorld) to.getWorld()).getHandle(); + // Close any foreign inventory + if (getHandle().activeContainer != getHandle().defaultContainer) { + getHandle().closeInventory(); + } + // Check if the fromWorld and toWorld are the same. if (fromWorld == toWorld) { entity.playerConnection.teleport(to); } else { - // Close any foreign inventory - if (getHandle().activeContainer != getHandle().defaultContainer){ - getHandle().closeInventory(); - } server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true); } return true; -- cgit v1.2.3