Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-25 18:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Actually close the inventory on a *cross*-world teleport.

Browse Source
This commit is contained in:
Erik Broes 2012-01-17 22:50:18 +01:00
parent f5f268f939
commit 112e0816b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -313,12 +313,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Check if the fromWorld and toWorld are the same. // Check if the fromWorld and toWorld are the same.
if (fromWorld == toWorld) { if (fromWorld == toWorld) {
entity.netServerHandler.teleport(to);
} else {
// Close any foreign inventory // Close any foreign inventory
if (getHandle().activeContainer != getHandle().defaultContainer){ if (getHandle().activeContainer != getHandle().defaultContainer){
getHandle().closeInventory(); getHandle().closeInventory();
} }
entity.netServerHandler.teleport(to);
} else {
server.getHandle().moveToWorld(entity, toWorld.dimension, true, to); server.getHandle().moveToWorld(entity, toWorld.dimension, true, to);
} }
return true; return true;