additional cleanup / possible bugpatching in inventorytag

DenizenScript · Aug 30, 2020 · 7697d08 · 7697d08
1 parent ae5c87c
commit 7697d08
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -393,9 +393,11 @@ public boolean isGeneric() {
         return idType.equals("generic") || idType.equals("script") && !isUnique();
     }
 
+    public static final ElementTag defaultIdHolder = new ElementTag("unknown");
+
     public String idType = null;
 
-    public ObjectTag idHolder = null;
+    public ObjectTag idHolder = defaultIdHolder;
 
     public Long uniquifier = null;
 
@@ -456,10 +458,6 @@ public InventoryTag(int size) {
         this(size, "Chest");
     }
 
-    public InventoryTag(String idType) {
-        this.idType = CoreUtilities.toLowerCase(idType);
-    }
-
     public Inventory getInventory() {
         return inventory;
     }
@@ -574,7 +572,9 @@ else if (holder instanceof Entity) {
             else {
                 idType = "location";
                 idHolder = getLocation(holder);
-                return;
+                if (idHolder != null) {
+                    return;
+                }
             }
         }
         else if (getIdType().equals("player")) {