Fix annoying dInventory debug bug

No, we're not trying to adjust the property, silly.
DenizenScript · Oct 12, 2014 · 0a9cf42 · 0a9cf42
1 parent 9efede7
commit 0a9cf42
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -1462,9 +1462,12 @@ public String getAttribute(Attribute attribute) {
     private ArrayList<Mechanism> mechanisms = new ArrayList<Mechanism>();
 
     public void applyProperty(Mechanism mechanism) {
-        if (idType == null)  mechanisms.add(mechanism);
-        else if (idType.equals("generic") || mechanism.matches("holder")) adjust(mechanism);
-        else dB.echoError("Cannot apply properties to non-generic inventory!");
+        if (idType == null)
+            mechanisms.add(mechanism);
+        else if (idType.equals("generic") || mechanism.matches("holder"))
+            adjust(mechanism);
+        else if (!(idType.equals("location") && mechanism.matches("title")))
+            dB.echoError("Cannot apply properties to non-generic inventory!");
     }
 
     @Override

diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryTitle.java b/src/main/java/net/aufdemrand/denizen/objects/properties/inventory/InventoryTitle.java
@@ -50,7 +50,13 @@ else if (!title.startsWith("container."))
 
     @Override
     public String getPropertyString() {
-        return getTitle();
+        // Only show a property string for titles that can actually change
+        if (inventory.isUnique()
+                || inventory.getIdType().equals("generic")
+                || inventory.getIdType().equals("location"))
+            return getTitle();
+        else
+            return null;
     }
 
     @Override