mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-12 09:51:12 +01:00
SPIGOT-5799: InventoryCloseEvent fires after PlayerQuitEvent
This commit is contained in:
parent
26c0084f0a
commit
833da9c47d
2 changed files with 6 additions and 2 deletions
|
@ -265,13 +265,13 @@
|
|||
entityplayer.a(StatisticList.LEAVE_GAME);
|
||||
+
|
||||
+ // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
|
||||
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleInventoryCloseEvent(entityplayer);
|
||||
+ entityplayer.closeInventory();
|
||||
+
|
||||
+ PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
|
||||
+ cserver.getPluginManager().callEvent(playerQuitEvent);
|
||||
+ entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
|
||||
+
|
||||
+ entityplayer.playerTick();// SPIGOT-924
|
||||
+ entityplayer.playerTick(); // SPIGOT-924
|
||||
+ // CraftBukkit end
|
||||
+
|
||||
this.savePlayerFile(entityplayer);
|
||||
|
|
|
@ -1236,6 +1236,10 @@ public class CraftEventFactory {
|
|||
}
|
||||
|
||||
public static void handleInventoryCloseEvent(EntityHuman human) {
|
||||
// SPIGOT-5799 - no need to fire for when no inventory open
|
||||
if (human.activeContainer == human.defaultContainer) {
|
||||
return;
|
||||
}
|
||||
InventoryCloseEvent event = new InventoryCloseEvent(human.activeContainer.getBukkitView());
|
||||
human.world.getServer().getPluginManager().callEvent(event);
|
||||
human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
|
||||
|
|
Loading…
Reference in a new issue