#215 TUSBメモリーのスキルを外せるバグを修正

TUSB · Apr 23, 2024 · 238e4fb · 238e4fb
1 parent bf0b124
commit 238e4fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/data/skill/functions/trigger/.mcfunction b/data/skill/functions/trigger/.mcfunction
@@ -6,7 +6,7 @@ execute if score @s ChangeSkill matches 1000..9000 in area:control_area run func
 execute if score @s ChangeSkill matches 10000 anchored eyes positioned ^ ^-0.85 ^5 run function skill:shortcut/edit/show
 execute if score @s ChangeSkill matches 10001 anchored eyes positioned ^ ^-0.85 ^5 run function skill:shortcut/reset
 execute if score @s ChangeSkill matches 10001 run function makeup:skill/shortcut/sound
-execute if score @s ChangeSkill matches 10010 run function skill:trigger/set/delete
+execute if score @s ChangeSkill matches 10010 run function skill:trigger/delete/detection
 
 #スコアリセット
 scoreboard players reset @s ChangeSkill

diff --git a/...l/functions/trigger/set/delete.mcfunction → ...unctions/trigger/delete/delete.mcfunction b/...l/functions/trigger/set/delete.mcfunction → ...unctions/trigger/delete/delete.mcfunction
@@ -1,12 +1,8 @@
-#> skill:trigger/set/delete
+#> skill:trigger/delete/delete
 #
 # 手に持っているアイテムのスキル情報を削除する
 #
-# @within function skill:trigger/
-
-# メインハンドのアイテム情報取得
-    data remove storage item: Item
-    data modify storage item: Item set from entity @s SelectedItem
+# @within function skill:trigger/delete/detection
 
 # Lore削除
     function skill:trigger/set/remove_lore

diff --git a/data/skill/functions/trigger/delete/detection.mcfunction b/data/skill/functions/trigger/delete/detection.mcfunction
@@ -0,0 +1,9 @@
+# @within function skill:trigger/
+
+# メインハンドのアイテム情報取得
+data remove storage item: Item
+data modify storage item: Item set from entity @s SelectedItem
+
+# TUSBメモリーかどうかで分岐
+execute if data storage item: Item{tag:{Skill:{Type:"TUSBMemory"}}} run tellraw @s {"translate":"TUSBメモリーのスキルは削除できません。","color":"red"}
+execute unless data storage item: Item{tag:{Skill:{Type:"TUSBMemory"}}} run function skill:trigger/delete/delete