Implement InventoryOpenEvent (#938)

Related to #922.
GlowstoneMC · Jun 2, 2018 · 5d7d256 · 5d7d256
1 parent 5ea0b55
commit 5d7d256
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/net/glowstone/entity/GlowHumanEntity.java b/src/main/java/net/glowstone/entity/GlowHumanEntity.java
@@ -440,7 +440,7 @@ private GlowInventory getTopInventory() {
         return (GlowInventory) getOpenInventory().getTopInventory();
     }
 
-    private void resetInventoryView() {
+    void resetInventoryView() {
         openInventory(new GlowInventoryView(this));
     }
 

diff --git a/src/main/java/net/glowstone/entity/GlowPlayer.java b/src/main/java/net/glowstone/entity/GlowPlayer.java
@@ -160,6 +160,7 @@
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerAchievementAwardedEvent;
 import org.bukkit.event.player.PlayerBedEnterEvent;
@@ -3042,6 +3043,13 @@ public void openInventory(InventoryView view) {
         invMonitor = new InventoryMonitor(getOpenInventory());
         int viewId = invMonitor.getId();
         if (viewId != 0) {
+            InventoryOpenEvent event = EventFactory.getInstance().callEvent(
+                new InventoryOpenEvent(view));
+            if (event.isCancelled()) {
+                // close the inventory but don't fire the InventoryCloseEvent
+                resetInventoryView();
+                return;
+            }
             String title = view.getTitle();
             boolean defaultTitle = Objects.equals(view.getType().getDefaultTitle(), title);
             if (view.getTopInventory() instanceof PlayerInventory && defaultTitle) {