diff --git a/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction index 558134b892..27c4bd5eaf 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction @@ -19,7 +19,7 @@ function lib:status_log/show_health # MobのHealthよりダメージが高い場合Healthに設定 - scoreboard players operation $Damage Temporary < $Health Temporary + # scoreboard players operation $Damage Temporary < $Health Temporary # 減算 scoreboard players operation $Health Temporary -= $Damage Temporary diff --git a/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/kill_and_death/kill.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/kill_and_death/kill.mcfunction index fc1e206fe2..c525f881b1 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/kill_and_death/kill.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/kill_and_death/kill.mcfunction @@ -8,7 +8,8 @@ function oh_my_dat:please data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed append value {Type: "api",IsVanilla:false} execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].To int 1 run scoreboard players get $DamagerUUID Temporary -execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount double 0.01 run scoreboard players get $Damage Temporary +execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount.Base double 0.01 run scoreboard players get $Damage Temporary +execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount.Over double -0.01 run scoreboard players get $Health Temporary data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].AttackType set from storage api: Argument.AttackType data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].ElementType set from storage api: Argument.ElementType data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Metadata set from storage api: Argument.Metadata