Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 20:16:19 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5799: InventoryCloseEvent fires after PlayerQuitEvent

Browse Source
This commit is contained in:
md_5 2020-06-24 09:54:59 +10:00
parent 26c0084f0a
commit 833da9c47d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nms-patches/PlayerList.patch
View File

@ -265,13 +265,13 @@
entityplayer.a(StatisticList.LEAVE_GAME); entityplayer.a(StatisticList.LEAVE_GAME);
+ +
+ // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it + // 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"); + PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
+ cserver.getPluginManager().callEvent(playerQuitEvent); + cserver.getPluginManager().callEvent(playerQuitEvent);
+ entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage()); + entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
+ +
+ entityplayer.playerTick();// SPIGOT-924 + entityplayer.playerTick(); // SPIGOT-924
+ // CraftBukkit end + // CraftBukkit end
+ +
this.savePlayerFile(entityplayer); this.savePlayerFile(entityplayer);

4
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -1236,6 +1236,10 @@ public class CraftEventFactory {
} }
public static void handleInventoryCloseEvent(EntityHuman human) { 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()); InventoryCloseEvent event = new InventoryCloseEvent(human.activeContainer.getBukkitView());
human.world.getServer().getPluginManager().callEvent(event); human.world.getServer().getPluginManager().callEvent(event);
human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity()); human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());