redesign hologram_lines again to the new hologramtrait structure

DenizenScript · May 22, 2022 · 37d50a7 · 37d50a7
1 parent 4635077
commit 37d50a7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java
@@ -1374,13 +1374,9 @@ public void adjust(Mechanism mechanism) {
         // -->
         if (mechanism.matches("hologram_lines") && mechanism.requireObject(ListTag.class)) {
             HologramTrait hologram = getCitizen().getOrAddTrait(HologramTrait.class);
-            if (npc.isSpawned()) {
-                hologram.onDespawn();
-            }
-            hologram.getLines().clear();
-            hologram.getLines().addAll(mechanism.valueAsType(ListTag.class));
-            if (npc.isSpawned()) {
-                hologram.onSpawn();
+            hologram.clear();
+            for (String line : mechanism.valueAsType(ListTag.class)) {
+                hologram.addLine(line);
             }
         }
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
@@ -2426,6 +2426,20 @@ public static ListTag getHandlerPluginList(Class eventClass) {
 
     public static void adjustServer(Mechanism mechanism) {
 
+        // <--[mechanism]
+        // @object server
+        // @name clean_flags
+        // @input None
+        // @description
+        // Cleans any expired flags from the object.
+        // Generally doesn't need to be called, using the 'skip flag cleanings' setting was enabled.
+        // This is an internal/special case mechanism, and should be avoided where possible.
+        // Does not function on all flaggable objects, particularly those that just store their flags into other objects.
+        // -->
+        if (mechanism.matches("clean_flags")) {
+            DenizenCore.serverFlagMap.doTotalClean();
+        }
+
         // <--[mechanism]
         // @object server
         // @name delete_file