From 112e0816b9aa0b51db2a08010385d38d5a965cb3 Mon Sep 17 00:00:00 2001
From: Erik Broes <erikbroes@grum.nl>
Date: Tue, 17 Jan 2012 22:50:18 +0100
Subject: [PATCH] Actually close the inventory on a *cross*-world teleport.

---
 src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 4 ++--
 1 file 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 8109958460..e4f1b160ef 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;