improve dInventory.setTitle

DenizenScript · Jun 28, 2018 · 74d0813 · 74d0813
1 parent 5c6ace5
commit 74d0813
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -420,19 +420,19 @@ public void setTitle(String title) {
         if (!(getIdType().equals("generic") || getIdType().equals("script")) || title == null) {
             return;
         }
-        if (inventory.getTitle().equals(title)) {
+        if (inventory != null && inventory.getTitle().equals(title)) {
             return;
         }
-        if (notableColors != null) {
-            title += notableColors;
-            InventoryScriptHelper.notableInventories.remove(inventory.getTitle());
-            InventoryScriptHelper.notableInventories.put(title, this);
-        }
-        else if (inventory == null) {
+        if (inventory == null) {
             inventory = Bukkit.getServer().createInventory(null, maxSlots, title);
             loadIdentifiers();
             return;
         }
+        else if (notableColors != null) {
+            title += notableColors;
+            InventoryScriptHelper.notableInventories.remove(inventory.getTitle());
+            InventoryScriptHelper.notableInventories.put(title, this);
+        }
         ItemStack[] contents = inventory.getContents();
         if (inventory.getType() == InventoryType.CHEST) {
             inventory = Bukkit.getServer().createInventory(null, inventory.getSize(), title);