Merge pull request #76054 from SurFlurer/fix_imperfect_doll

Prevent the imperfect doll being activated multiple times
CleverRaven · Aug 31, 2024 · 0c16bd0 · 0c16bd0
2 parents 0b709ec + 9415f67
commit 0c16bd0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
@@ -15,7 +15,8 @@
         "type": "neutral",
         "popup": true
       },
-      { "math": [ "u_vitri_glass_entered", "=", "1" ] }
+      { "math": [ "u_vitri_glass_entered", "=", "1" ] },
+      { "math": [ "u_back_from_vitri_glass", "=", "0" ] }
     ]
   },
   {
@@ -364,7 +365,11 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_queue_unvitrified_return",
-    "effect": { "queue_eocs": "EOC_unvitrified_return", "time_in_future": "1 seconds" }
+    "condition": { "math": [ "u_back_from_vitri_glass", "<", "1" ] },
+    "effect": [
+      { "queue_eocs": "EOC_unvitrified_return", "time_in_future": "1 seconds" },
+      { "math": [ "u_back_from_vitri_glass", "=", "1" ] }
+    ]
   },
   {
     "type": "effect_on_condition",