diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage/foreach.mcfunction index 8a26114800..686e8fb493 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_drowning/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_drowning/foreach.mcfunction index a931fd6450..323a5e896f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_drowning/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_drowning/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_drowning/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity/foreach.mcfunction index 2d014d8b97..821ccf74c4 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_entity/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_explosion/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_explosion/foreach.mcfunction index 540eb8efb2..2aee802585 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_explosion/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_explosion/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_entity_explosion/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_melee/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_melee/foreach.mcfunction index f1080230a2..e200baf8b4 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_melee/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_melee/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_entity_melee/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_projectile/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_projectile/foreach.mcfunction index a2e7e821bd..0bdb9472f7 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_projectile/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_entity_projectile/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_entity_projectile/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_explosion/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_explosion/foreach.mcfunction index b59354922b..18c6b2fd92 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_explosion/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_explosion/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_explosion/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_fire/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_fire/foreach.mcfunction index 4f63000791..b844a2a525 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_fire/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_fire/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_fire/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_freezing/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_freezing/foreach.mcfunction index 992d2e4daa..c79e13a5c1 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_freezing/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_freezing/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_freezing/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_lightning/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_lightning/foreach.mcfunction index 74c2d9433e..7cded71747 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_lightning/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_lightning/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_lightning/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_melee/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_melee/foreach.mcfunction index 1e9857736f..f1a13f5d5d 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_melee/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_melee/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_melee/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_projectile/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_projectile/foreach.mcfunction index 9a343a3c77..3a264b074a 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_projectile/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/damage_projectile/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Attacker] remove Attacker tag @s remove CanUsed data remove storage asset:context Damage - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/damage_projectile/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill/foreach.mcfunction index f57522e21a..07420bdb6e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Victim] remove Victim tag @s remove CanUsed data remove storage asset:context Kill - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/kill/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_explosion/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_explosion/foreach.mcfunction index a8bb81aa03..035047fa36 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_explosion/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_explosion/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Victim] remove Victim tag @s remove CanUsed data remove storage asset:context Kill - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/kill_explosion/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_melee/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_melee/foreach.mcfunction index e112d71714..917dd6dac6 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_melee/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_melee/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Victim] remove Victim tag @s remove CanUsed data remove storage asset:context Kill - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/kill_melee/foreach diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_projectile/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_projectile/foreach.mcfunction index 05bfcdcb22..9b4c310275 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_projectile/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/kill_projectile/foreach.mcfunction @@ -20,7 +20,6 @@ tag @e[type=#lib:living,type=!player,tag=Victim] remove Victim tag @s remove CanUsed data remove storage asset:context Kill - data remove storage asset:artifact AttackTargets data remove storage asset:artifact Events[-1] # 要素が残っているなら再帰 execute if data storage asset:artifact Events[0] run function asset_manager:artifact/triggers/kill_projectile/foreach