Added null checks to inventories and inventory titles to avoid errors

with customize inventories that do not have titles or holders.
tastybento · May 11, 2016 · 276b57a · 276b57a
1 parent 4ae7861
commit 276b57a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/src/com/wasteofplastic/askyblock/listeners/IslandGuard.java b/src/com/wasteofplastic/askyblock/listeners/IslandGuard.java
@@ -157,7 +157,7 @@ protected static boolean inWorld(Location loc) {
      */
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled=true)
     public void onHorseInventoryClick(InventoryClickEvent event) {
-        if (!(event.getInventory().getHolder() instanceof Horse)) {
+        if (event.getInventory().getHolder() == null || !(event.getInventory().getHolder() instanceof Horse)) {
             //plugin.getLogger().info("DEBUG: not a horse!");
             return;
         }

diff --git a/src/com/wasteofplastic/askyblock/panels/BiomesPanel.java b/src/com/wasteofplastic/askyblock/panels/BiomesPanel.java
@@ -141,7 +141,7 @@ public void onInventoryClick(InventoryClickEvent event) {
         // clicked in
         int slot = event.getRawSlot();
         // Check this is the right panel
-        if (!inventory.getName().equals(plugin.myLocale().biomePanelTitle)) {
+        if (inventory.getName() == null || !inventory.getName().equals(plugin.myLocale().biomePanelTitle)) {
             return;
         }
         if (slot == -999) {

diff --git a/src/com/wasteofplastic/askyblock/panels/ControlPanel.java b/src/com/wasteofplastic/askyblock/panels/ControlPanel.java
@@ -208,8 +208,10 @@ public void onInventoryClick(InventoryClickEvent event) {
         Player player = (Player) event.getWhoClicked(); // The player that
         // clicked the item
         ItemStack clicked = event.getCurrentItem(); // The item that was clicked
-        Inventory inventory = event.getInventory(); // The inventory that was
-        // clicked in
+        Inventory inventory = event.getInventory(); // The inventory that was clicked in
+        if (inventory.getName() == null) {
+            return;
+        }
         // ASkyBlock plugin = ASkyBlock.getPlugin();
         int slot = event.getRawSlot();
         // Challenges

diff --git a/src/com/wasteofplastic/askyblock/panels/SchematicsPanel.java b/src/com/wasteofplastic/askyblock/panels/SchematicsPanel.java
@@ -93,8 +93,10 @@ public Inventory getPanel(Player player) {
     public void onInventoryClick(InventoryClickEvent event) {
         Player player = (Player) event.getWhoClicked(); // The player that
         // clicked the item
-        Inventory inventory = event.getInventory(); // The inventory that was
-        // clicked in
+        Inventory inventory = event.getInventory(); // The inventory that was clicked in
+        if (inventory.getName() == null) {
+            return;
+        }
         int slot = event.getRawSlot();
         // Check this is the right panel
         if (!inventory.getName().equals(plugin.myLocale(player.getUniqueId()).schematicsTitle)) {

diff --git a/src/com/wasteofplastic/askyblock/panels/SettingsPanel.java b/src/com/wasteofplastic/askyblock/panels/SettingsPanel.java
@@ -232,6 +232,9 @@ public Inventory islandGuardPanel(Player player) {
     public void onInventoryClick(InventoryClickEvent event) {
         Player player = (Player) event.getWhoClicked(); // The player that clicked the item
         Inventory inventory = event.getInventory(); // The inventory that was clicked in
+        if (inventory.getName() == null) {
+            return;
+        }
         int slot = event.getRawSlot();
         // Check this is the right panel
         if (!inventory.getName().equals(plugin.myLocale(player.getUniqueId()).igsTitle)) {

diff --git a/src/com/wasteofplastic/askyblock/panels/WarpPanel.java b/src/com/wasteofplastic/askyblock/panels/WarpPanel.java
@@ -224,6 +224,9 @@ public Inventory getWarpPanel(int panelNumber) {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled=true)
     public void onInventoryClick(InventoryClickEvent event) {
         Inventory inventory = event.getInventory(); // The inventory that was clicked in
+        if (inventory.getName() == null) {
+            return;
+        }
         String title = inventory.getTitle();
         if (!inventory.getTitle().startsWith(plugin.myLocale().warpsTitle + " #")) {
             return;