fix note removal logic order

DenizenScript · Mar 26, 2021 · f949f53 · f949f53
1 parent ca85985
commit f949f53
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java
@@ -663,9 +663,9 @@ public void makeUnique(String id) {
 
     @Override
     public void forget() {
+        NotableManager.remove(this);
         noteName = null;
         flagTracker = null;
-        NotableManager.remove(this);
     }
 
     /////////////////////

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java
@@ -186,9 +186,9 @@ public void makeUnique(String id) {
 
     @Override
     public void forget() {
-        flagTracker = null;
         NotableManager.remove(this);
         InventoryScriptHelper.notedInventories.remove(inventory);
+        flagTracker = null;
         noteName = null;
     }
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PolygonTag.java
@@ -425,9 +425,9 @@ public void makeUnique(String id) {
 
     @Override
     public void forget() {
+        NotableManager.remove(this);
         noteName = null;
         flagTracker = null;
-        NotableManager.remove(this);
     }
 
     String prefix = "Polygon";

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java b/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java
@@ -125,9 +125,8 @@ private static void _recallNotables() {
                 Notable obj = (Notable) ObjectFetcher.getObjectFrom(clazz, objText, CoreUtilities.errorButNoDebugContext);
                 if (obj != null) {
                     obj.makeUnique(notable);
-                    obj = getSavedObject(notable);
                     if (flagText != null && obj instanceof FlaggableObject) {
-                        ((FlaggableObject) obj).reapplyTracker(new SavableMapFlagTracker(flagText));
+                        ((FlaggableObject) getSavedObject(notable)).reapplyTracker(new SavableMapFlagTracker(flagText));
                     }
                 }
                 else {