Teehee :3

enjarai · Sep 20, 2024 · aed0eef · aed0eef
1 parent bab8f81
commit aed0eef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/dev/enjarai/trickster/spell/Fragment.java b/src/main/java/dev/enjarai/trickster/spell/Fragment.java
@@ -46,8 +46,8 @@ default SerializedSpellInstruction asSerialized() {
         return new SerializedSpellInstruction(SpellInstructionType.FRAGMENT, this);
     }
 
-    default boolean isEphemeral() {
-        return false;
+    default Fragment applyEphemeral() {
+        return this;
     }
 
     default Optional<BiFunction<SpellContext, List<Fragment>, Fragment>> getActivator() {

diff --git a/src/main/java/dev/enjarai/trickster/spell/SpellPart.java b/src/main/java/dev/enjarai/trickster/spell/SpellPart.java
@@ -75,9 +75,7 @@ public void brutallyMurderEphemerals() {
         if (glyph instanceof SpellPart spellPart) {
             spellPart.brutallyMurderEphemerals();
         } else {
-            if (glyph.isEphemeral()) {
-                glyph = new ZalgoFragment();
-            }
+            glyph = glyph.applyEphemeral();
         }
     }
 

diff --git a/src/main/java/dev/enjarai/trickster/spell/fragment/EntityFragment.java b/src/main/java/dev/enjarai/trickster/spell/fragment/EntityFragment.java
@@ -44,8 +44,8 @@ public BooleanFragment asBoolean() {
     }
 
     @Override
-    public boolean isEphemeral() {
-        return true;
+    public Fragment applyEphemeral() {
+        return new ZalgoFragment();
     }
 
     public static EntityFragment from(Entity entity) {

diff --git a/src/main/java/dev/enjarai/trickster/spell/fragment/ListFragment.java b/src/main/java/dev/enjarai/trickster/spell/fragment/ListFragment.java
@@ -39,6 +39,11 @@ public Text asText() {
         return result.append("]");
     }
 
+    @Override
+    public Fragment applyEphemeral() {
+        return new ListFragment(fragments.stream().map(Fragment::applyEphemeral).toList());
+    }
+
     @Override
     public BooleanFragment asBoolean() {
         return new BooleanFragment(!fragments.isEmpty());