Pass two: delete on despawn

DenizenScript · May 2, 2015 · 4b15826 · 4b15826
1 parent cc92225
commit 4b15826
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java b/src/main/java/net/aufdemrand/denizen/flags/FlagManager.java
@@ -145,6 +145,10 @@ public static void clearNPCFlags(int npcid) {
         DenizenAPI.getCurrentInstance().getSaves().set("NPCs." + npcid, null);
     }
 
+    public static void clearEntityFlags(dEntity entity) {
+        DenizenAPI.getCurrentInstance().getSaves().set("Entities." + entity.getSaveName(), null);
+    }
+
     /**
      * Returns a NPC Flag object. If this flag currently exists
      * it will be populated with the current values. If the flag does NOT exist,

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/EntityScriptHelper.java
@@ -2,6 +2,7 @@
 
 
 import net.aufdemrand.denizen.events.scriptevents.EntityDespawnScriptEvent;
+import net.aufdemrand.denizen.flags.FlagManager;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.aufdemrand.denizen.utilities.world.DenizenWorldAccess;
@@ -162,5 +163,6 @@ public static void unlinkEntity(Entity ent) {
         if (ent == null || ent.getUniqueId() == null)
             return;
         entities.remove(ent.getUniqueId());
+        FlagManager.clearEntityFlags(new dEntity(ent));
     }
 }