Safely handle cancelled inventory open events on vaults by checking if inventory is null AFTER it's opened. Resolves #354

2018-05-21 13:51:39 -07:00
parent ed858dd01e
commit 920a4398e1
2 changed files with 11 additions and 1 deletions
@@ -140,7 +140,18 @@ public class VaultOperations {
                    PlayerVaults.debug(String.format("Failed to open null vault %d for %s. This is weird.", number, player.getName()));
                    return false;
                }
+
                player.openInventory(inv);
+
+                // Check if the inventory was actually opened
+                if (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.
+                }
+
+                VaultViewInfo info = new VaultViewInfo(player.getUniqueId(), number);
+                PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
+
                player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
                return true;
            } else {