🩹 前のデータにFieldが存在するときだけマージを実行するように

haiiro2gou · May 18, 2024 · b4c9b1e · b4c9b1e
1 parent a28aeca
commit b4c9b1e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/TheSkyBlessing/data/asset_manager/functions/effect/give/make_effect_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/effect/give/make_effect_data.mcfunction
@@ -46,8 +46,9 @@
     data modify storage asset:effect EffectData.IsBadEffect set from storage asset:effect IsBadEffect
     data modify storage asset:effect EffectData.ProcessOnDied set from storage asset:effect ProcessOnDied
     data modify storage asset:effect EffectData.RequireClearLv set from storage asset:effect RequireClearLv
-    data modify storage asset:effect EffectData.Field set from storage asset:effect TargetEffectData.Field
-    data modify storage asset:effect EffectData.Field merge from storage asset:effect Field
+    execute unless data storage asset:effect TargetEffectData.Field run data modify storage asset:effect EffectData.Field set from storage asset:effect Field
+    execute if data storage asset:effect TargetEffectData.Field run data modify storage asset:effect EffectData.Field set from storage asset:effect TargetEffectData.Field
+    execute if data storage asset:effect TargetEffectData.Field run data modify storage asset:effect EffectData.Field merge from storage asset:effect Field
 # イベント設定
     execute unless data storage asset:effect TargetEffectData run data modify storage asset:effect EffectData.NextEvent set value "given"
     execute if data storage asset:effect TargetEffectData run data modify storage asset:effect EffectData.NextEvent set value "re-given"