reduce risk of notable property issues

DenizenScript · Feb 25, 2019 · 6fe3ae0 · 6fe3ae0
1 parent 50c69cf
commit 6fe3ae0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dCuboid.java
@@ -1578,6 +1578,10 @@ public String getAttribute(Attribute attribute) {
     }
 
     public void applyProperty(Mechanism mechanism) {
+        if (NotableManager.isExactSavedObject(this)) {
+            dB.echoError("Cannot apply properties to noted objects.");
+            return;
+        }
         adjust(mechanism);
     }
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -2130,6 +2130,10 @@ else if (slot > getInventory().getSize() - 1) {
     private ArrayList<Mechanism> mechanisms = new ArrayList<Mechanism>();
 
     public void applyProperty(Mechanism mechanism) {
+        if (NotableManager.isExactSavedObject(this)) {
+            dB.echoError("Cannot apply properties to noted objects.");
+            return;
+        }
         if (idType == null) {
             mechanisms.add(mechanism);
         }

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dItem.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dItem.java
@@ -1064,6 +1064,10 @@ public String getAttribute(Attribute attribute) {
 
 
     public void applyProperty(Mechanism mechanism) {
+        if (NotableManager.isExactSavedObject(this)) {
+            dB.echoError("Cannot apply properties to noted objects.");
+            return;
+        }
         adjust(mechanism);
     }
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/notable/NotableManager.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/notable/NotableManager.java
@@ -55,6 +55,15 @@ public static boolean isSaved(Notable object) {
     }
 
 
+    public static boolean isExactSavedObject(Notable object) {
+        String id = reverseObjects.get(object);
+        if (id == null) {
+            return false;
+        }
+        // Reference equality
+        return notableObjects.get(id) == object;
+    }
+
     public static Notable getSavedObject(String id) {
         if (notableObjects.containsKey(CoreUtilities.toLowerCase(id))) {
             return notableObjects.get(CoreUtilities.toLowerCase(id));