SPIGOT-5799: InventoryCloseEvent fires after PlayerQuitEvent

nms-patches/PlayerList.patch

@@ -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);

src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -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());