2013-04-03 09:20:29 +02:00
From a32a925ad6864721c2a21eb53d815a89d881f2b1 Mon Sep 17 00:00:00 2001
2013-01-15 02:18:40 +01:00
From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:09:40 +1100
2013-04-03 09:20:29 +02:00
Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when a secondary container is closed due to the player entity being destroyed. This covers all edge cases such as server stop / player kick / player quit.
2013-01-15 02:18:40 +01:00
---
2013-04-03 09:20:29 +02:00
.../java/net/minecraft/server/EntityHuman.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
2013-01-15 02:18:40 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
2013-04-03 09:20:29 +02:00
index 101c2a0..76cfc2a 100644
2013-01-15 02:18:40 +01:00
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
2013-03-15 22:35:56 +01:00
@@ -5,11 +5,13 @@ import java.util.Iterator;
2013-01-15 02:18:40 +01:00
import java.util.List;
// CraftBukkit start
+import org.bukkit.Bukkit;
2013-01-20 04:52:20 +01:00
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
2013-01-15 02:18:40 +01:00
import org.bukkit.craftbukkit.entity.CraftItem;
2013-03-02 23:37:31 +01:00
import org.bukkit.craftbukkit.inventory.CraftItemStack;
2013-01-15 02:18:40 +01:00
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityCombustByEntityEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.player.PlayerBedEnterEvent;
import org.bukkit.event.player.PlayerBedLeaveEvent;
import org.bukkit.event.player.PlayerDropItemEvent;
2013-03-15 22:35:56 +01:00
@@ -941,6 +943,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
2013-01-15 02:18:40 +01:00
super.die();
this.defaultContainer.b(this);
if (this.activeContainer != null) {
+ // CraftBukkit start
+ InventoryCloseEvent event = new InventoryCloseEvent(this.activeContainer.getBukkitView());
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ // CraftBukkit end
this.activeContainer.b(this);
}
}
--
2013-04-03 09:20:29 +02:00
1.7.0.4
2013-01-15 02:18:40 +01:00