Probable fix for #1672

DenizenScript · Oct 9, 2017 · de40a56 · de40a56
1 parent ea51242
commit de40a56
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDragsInInvScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/PlayerDragsInInvScriptEvent.java
@@ -77,6 +77,7 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
                 "\0";
         if (!inv.equals("") && !inv.equals("inventory")
                 && !inv.equals(CoreUtilities.toLowerCase(dInv.getInventoryType().name()))
+                && !inv.equals(CoreUtilities.toLowerCase(dInv.bestName()))
                 && !inv.equals(nname)) {
             return false;
         }

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -1236,14 +1236,25 @@ public String identify() {
     }
 
 
+    public String bestName() {
+        if (isUnique()) {
+            return NotableManager.getSavedId(this);
+        }
+        else {
+            return (getIdType().equals("script") || getIdType().equals("notable")
+                    ? idHolder : (idType));
+        }
+    }
+
+
     @Override
     public String identifySimple() {
         if (isUnique()) {
             return "in@" + NotableManager.getSavedId(this);
         }
         else {
             return "in@" + (getIdType().equals("script") || getIdType().equals("notable")
-                    ? idHolder : (idType + "[" + idHolder + ']'));
+                    ? idHolder : (idType + "[" + idHolder + "]"));
         }
     }