Better handle cancelled inventory open event

src/main/java/com/drtshock/playervaults/listeners/SignListener.java

@@ -38,6 +38,7 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.Inventory;
 
 public class SignListener implements Listener {
@@ -123,6 +124,12 @@ public class SignListener implements Listener {
                                 Inventory inv = VaultManager.getInstance().loadOwnVault(player, num, VaultOperations.getMaxVaultSize(player));
                                 if (inv != null) {
                                     player.openInventory(inv);
+
+                                    // Check if the inventory was actually opened
+                                    if (player.getOpenInventory().getTopInventory() instanceof CraftingInventory || player.getOpenInventory().getTopInventory() == null) {
+                                        PlayerVaults.debug(String.format("Cancelled opening sign vault.", player.getName()));
+                                        return; // inventory open event was cancelled.
+                                    }
                                 }
                             } else {
                                 player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS.toString());
@@ -134,6 +141,12 @@ public class SignListener implements Listener {
                                 player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
                             } else {
                                 player.openInventory(inv);
+
+                                // Check if the inventory was actually opened
+                                if (player.getOpenInventory().getTopInventory() instanceof CraftingInventory || player.getOpenInventory().getTopInventory() == null) {
+                                    PlayerVaults.debug(String.format("Cancelled opening non-self sign vault.", player.getName()));
+                                    return; // inventory open event was cancelled.
+                                }
                             }
                         }
                         PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(self ? player.getUniqueId().toString() : offlinePlayer.getUniqueId().toString(), num));

src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java

@@ -25,6 +25,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 
@@ -156,7 +157,7 @@ public class VaultOperations {
                 player.openInventory(inv);
 
                 // Check if the inventory was actually opened
-                if (player.getOpenInventory().getTopInventory() == null) {
+                if (player.getOpenInventory().getTopInventory() instanceof CraftingInventory || player.getOpenInventory().getTopInventory() == null) {
                     PlayerVaults.debug(String.format("Cancelled opening vault %s for %s from an outside source.", arg, player.getName()));
                     return false; // inventory open event was cancelled.
                 }
@@ -235,6 +236,12 @@ public class VaultOperations {
             player.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
         } else {
             player.openInventory(inv);
+
+            // Check if the inventory was actually opened
+            if (player.getOpenInventory().getTopInventory() instanceof CraftingInventory || player.getOpenInventory().getTopInventory() == null) {
+                PlayerVaults.debug(String.format("Cancelled opening vault %s for %s from an outside source.", arg, player.getName()));
+                return false; // inventory open event was cancelled.
+            }
             player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", name));
             PlayerVaults.debug("opening other vault", time);