Răsfoiți Sursa

修复观察者玩家血量

HerobrineXia 6 ani în urmă
părinte
comite
e0454c1d75
1 a modificat fișierele cu 0 adăugiri și 5 ștergeri
  1. 0 5
      data/mini/functions/hotpm/player_enter.mcfunction

+ 0 - 5
data/mini/functions/hotpm/player_enter.mcfunction

@@ -25,11 +25,6 @@ gamemode adventure @s[tag=!watcher,tag=!rejoining]
 # 设置玩家生命数量
 # 设置玩家生命数量
 scoreboard players set @s[tag=!watcher,tag=!rejoining] mini_heart 2
 scoreboard players set @s[tag=!watcher,tag=!rejoining] mini_heart 2
 function mini:main/player_max_health
 function mini:main/player_max_health
-<<<<<<< HEAD
-
-# TODO 灭火无效
-=======
->>>>>>> be7408dcf305894b2fb01b413b2f71757f09249f
 
 
 # 重新加入处理
 # 重新加入处理
 execute if entity @s[tag=rejoining] run function mini:hotpm/player_lose_heart
 execute if entity @s[tag=rejoining] run function mini:hotpm/player_lose_heart