diff --git a/data/fzsd/advancements/game_event/on_used_tool.json b/data/fzsd/advancements/game_event/on_used_tool.json
index bc35607..611b376 100644
--- a/data/fzsd/advancements/game_event/on_used_tool.json
+++ b/data/fzsd/advancements/game_event/on_used_tool.json
@@ -7,7 +7,6 @@
                 "player": [
                     {
                         "condition": "minecraft:reference",
-                        "entity": "this",
                         "name": "fzsd:used_tool"
                     }
                 ]
diff --git a/data/fzsd/functions/game_event/advancement/on_aviate_one_meter.mcfunction b/data/fzsd/functions/game_event/advancement/on_aviate_one_meter.mcfunction
index 732739c..978b737 100644
--- a/data/fzsd/functions/game_event/advancement/on_aviate_one_meter.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_aviate_one_meter.mcfunction
@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.aviating_distance %= 200 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_aviate_one_meter
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_aviate_one_meter
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_dead.mcfunction b/data/fzsd/functions/game_event/advancement/on_dead.mcfunction
index 4a7511c..3b7a235 100644
--- a/data/fzsd/functions/game_event/advancement/on_dead.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_dead.mcfunction
@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players set @s fzsd.event.death_count 0
-advancement revoke @s only fzsd:game_event/on_dead
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_dead
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_entered_nether_portal.mcfunction b/data/fzsd/functions/game_event/advancement/on_entered_nether_portal.mcfunction
index a54c2c1..b17436f 100644
--- a/data/fzsd/functions/game_event/advancement/on_entered_nether_portal.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_entered_nether_portal.mcfunction
@@ -4,4 +4,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_entered_nether_portal
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_entered_nether_portal
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_entered_nether_portal
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_fished.mcfunction b/data/fzsd/functions/game_event/advancement/on_fished.mcfunction
index da74e56..a66acbe 100644
--- a/data/fzsd/functions/game_event/advancement/on_fished.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_fished.mcfunction
@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_fished
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_fished
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_fished
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_hurt_entity_with_tools.mcfunction b/data/fzsd/functions/game_event/advancement/on_hurt_entity_with_tools.mcfunction
index d7fdcd6..9c3af36 100644
--- a/data/fzsd/functions/game_event/advancement/on_hurt_entity_with_tools.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_hurt_entity_with_tools.mcfunction
@@ -10,4 +10,4 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_hurt_entity_with_tools
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_hurt_entity_with_tools
+advancement revoke @s from fzsd:game_event/on_hurt_entity_with_tools
diff --git a/data/fzsd/functions/game_event/advancement/on_killed_mob_or_player.mcfunction b/data/fzsd/functions/game_event/advancement/on_killed_mob_or_player.mcfunction
index cf55eb7..ee9dd51 100644
--- a/data/fzsd/functions/game_event/advancement/on_killed_mob_or_player.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_killed_mob_or_player.mcfunction
@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_killed_mob_or_player
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_killed_mob_or_player
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_killed_mob_or_player
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_piglin_trade.mcfunction b/data/fzsd/functions/game_event/advancement/on_piglin_trade.mcfunction
index 0a2258d..95436d3 100644
--- a/data/fzsd/functions/game_event/advancement/on_piglin_trade.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_piglin_trade.mcfunction
@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_piglin_trade
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_piglin_trade
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_piglin_trade
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction b/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction
index 9154ea2..9b2d63a 100644
--- a/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction
@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_placed_block
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_placed_block
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_placed_block
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_play_one_hour.mcfunction b/data/fzsd/functions/game_event/advancement/on_play_one_hour.mcfunction
index 5934f1b..352695d 100644
--- a/data/fzsd/functions/game_event/advancement/on_play_one_hour.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_play_one_hour.mcfunction
@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.play_ticks %= 72000 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_play_one_hour
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_play_one_hour
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_shears_used_on_entity.mcfunction b/data/fzsd/functions/game_event/advancement/on_shears_used_on_entity.mcfunction
index 048e325..e241bab 100644
--- a/data/fzsd/functions/game_event/advancement/on_shears_used_on_entity.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_shears_used_on_entity.mcfunction
@@ -10,4 +10,4 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_shears_used_on_entity
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_shears_used_on_entity
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_shears_used_on_entity
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_took_damage.mcfunction b/data/fzsd/functions/game_event/advancement/on_took_damage.mcfunction
index b82a44c..1a6b66c 100644
--- a/data/fzsd/functions/game_event/advancement/on_took_damage.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_took_damage.mcfunction
@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.damage_taken %= 10 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_took_damage
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_took_damage
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_tools_used_on_block.mcfunction b/data/fzsd/functions/game_event/advancement/on_tools_used_on_block.mcfunction
index 6845397..b118083 100644
--- a/data/fzsd/functions/game_event/advancement/on_tools_used_on_block.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_tools_used_on_block.mcfunction
@@ -10,5 +10,5 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_tools_used_on_block
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_tool_axes_used_on_block
-advancement revoke @s only fzsd:game_event/on_tools_exclude_axes_used_on_block
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_tool_axes_used_on_block
+advancement revoke @s from fzsd:game_event/on_tools_exclude_axes_used_on_block
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_unsneak.mcfunction b/data/fzsd/functions/game_event/advancement/on_unsneak.mcfunction
index 5daca2a..0945120 100644
--- a/data/fzsd/functions/game_event/advancement/on_unsneak.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_unsneak.mcfunction
@@ -10,4 +10,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_unsneak
 
 ## 重置事件进度
-advancement revoke @s until fzsd:game_event/on_unsneak
\ No newline at end of file
+advancement revoke @s through fzsd:game_event/on_unsneak
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_used_tool.mcfunction b/data/fzsd/functions/game_event/advancement/on_used_tool.mcfunction
index 32fceda..aae7055 100644
--- a/data/fzsd/functions/game_event/advancement/on_used_tool.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_used_tool.mcfunction
@@ -6,4 +6,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 function #fzsd:game_event/player/on_used_tool/reset_used_tool
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_used_tool
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_used_tool
\ No newline at end of file
diff --git a/data/fzsd/functions/game_event/advancement/on_villager_trade.mcfunction b/data/fzsd/functions/game_event/advancement/on_villager_trade.mcfunction
index 8bca9c6..0ef9ed4 100644
--- a/data/fzsd/functions/game_event/advancement/on_villager_trade.mcfunction
+++ b/data/fzsd/functions/game_event/advancement/on_villager_trade.mcfunction
@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_villager_trade
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_villager_trade
\ No newline at end of file
+advancement revoke @s from fzsd:game_event/on_villager_trade
\ No newline at end of file
diff --git a/data/fzsd/functions/module/here/global_message.mcfunction b/data/fzsd/functions/module/here/global_message.mcfunction
index 93c12c0..edb20b3 100644
--- a/data/fzsd/functions/module/here/global_message.mcfunction
+++ b/data/fzsd/functions/module/here/global_message.mcfunction
@@ -1 +1 @@
-tellraw @a [{"selector": "@s"}, [{"text": "说：我在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]]
\ No newline at end of file
+tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说：我在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]]
\ No newline at end of file
diff --git a/data/fzsd/functions/module/last_nether_portal/global_message.mcfunction b/data/fzsd/functions/module/last_nether_portal/global_message.mcfunction
index e4348d8..ec8fd85 100644
--- a/data/fzsd/functions/module/last_nether_portal/global_message.mcfunction
+++ b/data/fzsd/functions/module/last_nether_portal/global_message.mcfunction
@@ -1,2 +1,2 @@
-execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @a [{"selector": "@s"}, [{"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]]
+execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]]
 execute unless score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s {"text": "你从未穿出过下界传送门！"}
\ No newline at end of file
diff --git a/data/fzsd/functions/system/uninstall/after.mcfunction b/data/fzsd/functions/system/uninstall/after.mcfunction
index e562f2e..cdb836e 100644
--- a/data/fzsd/functions/system/uninstall/after.mcfunction
+++ b/data/fzsd/functions/system/uninstall/after.mcfunction
@@ -2,4 +2,4 @@
 data modify storage fzsd:install fzsd.global set value 0b
 
 ## 日志
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "卸载完成！"}]
\ No newline at end of file
+tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "卸载完成！"}]
\ No newline at end of file