diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc
index 6d5cc2a1..3627e615 100644
--- a/server/gameserver/buff.cc
+++ b/server/gameserver/buff.cc
@@ -776,7 +776,7 @@ void Buff::ProcDive()
              }
              hum->DecHP(MetaMgr::Instance()->dive_hp_consume,
                         VP_Water,
-                        "水",
+                        "water",
                         0);
          },
          &xtimer_attacher.timer_list_
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index e7e0e45d..ef2a5288 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -860,6 +860,9 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
 
 void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id)
 {
+    if (!c->room->BattleStarted()) {
+        return;
+    }
     #ifdef DEBUG
     #if 0
     if (IsPlayer()) {