From 20e8aeac73fca2ea917d063ef5e8007fd4434230 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Fri, 27 Sep 2024 22:29:54 +0900
Subject: [PATCH] =?UTF-8?q?HealAPI=E3=81=ABDisableHealTrigger=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TheSkyBlessing/data/api/functions/heal/.mcfunction            | 1 +
 TheSkyBlessing/data/api/functions/heal/core/player.mcfunction | 2 +-
 TheSkyBlessing/data/api/functions/heal/reset.mcfunction       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/TheSkyBlessing/data/api/functions/heal/.mcfunction b/TheSkyBlessing/data/api/functions/heal/.mcfunction
index 4187a845bb..49c97008a8 100644
--- a/TheSkyBlessing/data/api/functions/heal/.mcfunction
+++ b/TheSkyBlessing/data/api/functions/heal/.mcfunction
@@ -9,6 +9,7 @@
 #   storage api: Argument.Heal : float
 #   storage api: Argument.FixedHeal? : boolean(default: false)
 #   storage api: Argument.DisableLog? : boolean(default: false)
+#   storage api: Argument.DisableHealTrigger? : boolean(default: false)
 # @api
 
 # 引数チェック
diff --git a/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction
index 1275dfca42..bc785f68c5 100644
--- a/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction
+++ b/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction
@@ -20,4 +20,4 @@
 # Healthを持つEntityであれば実行
     function lib:score_to_health_wrapper/fluctuation
 # onHealのトリガー
-    function api:heal/core/trigger_on_heal
+    execute unless data storage api: Argument{DisableHealTrigger:true} run function api:heal/core/trigger_on_heal
diff --git a/TheSkyBlessing/data/api/functions/heal/reset.mcfunction b/TheSkyBlessing/data/api/functions/heal/reset.mcfunction
index 15e2cd452e..749f40f672 100644
--- a/TheSkyBlessing/data/api/functions/heal/reset.mcfunction
+++ b/TheSkyBlessing/data/api/functions/heal/reset.mcfunction
@@ -7,3 +7,4 @@
 data remove storage api: Argument.Heal
 data remove storage api: Argument.FixedHeal
 data remove storage api: Argument.DisableLog
+data remove storage api: Argument.DisableHealTrigger