Merge branch 'master' of github.com:LTCatt/LTW3

data/mini/functions/diamond/game/respawn.mcfunction

@@ -1,6 +1,9 @@
 
 # 给予状态效果
 function mini:diamond/give_effect
+effect give @s slow_falling 4
+effect give @s weakness 5 10 true
+effect give @s resistance 5 10 true
 
 # 传送玩家
 tp @s[team=playing] 1016 280 5016

data/mini/functions/diamond/give_effect.mcfunction

@@ -3,6 +3,3 @@ effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s haste 1000000 1 true
-effect give @s slow_falling 4
-effect give @s weakness 5 10 true
-effect give @s resistance 5 10 true

data/mini/functions/phantom/give_effect.mcfunction

@@ -2,4 +2,3 @@
 # 状态效果
 effect clear @s
 effect give @s saturation 1000000 0 true
-effect give @s instant_health 10 0 true

data/mini/functions/trade/game/respawn.mcfunction

@@ -1,6 +1,9 @@
 
 # 给予状态效果
 function mini:trade/give_effect
+effect give @s slow_falling 4
+effect give @s weakness 5 10 true
+effect give @s resistance 5 10 true
 
 # 传送玩家
 tp @s[team=playing] 1016 280 5016

data/mini/functions/trade/give_effect.mcfunction

@@ -4,6 +4,3 @@ effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s haste 1000000 1 true
-effect give @s slow_falling 4
-effect give @s weakness 5 10 true
-effect give @s resistance 5 10 true