OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-24 09:16:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot 2012-01-17 22:50:18 +01:00
parent 322754c180
commit 179363588e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-server/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;