From 1be8e2da29c48fcca0d022de513b5f458124f276 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 10 May 2022 08:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=81=AB=E7=84=B0=E6=9E=AA?=
 =?UTF-8?q?=E6=88=98=E5=89=8D=E4=BC=A4=E5=AE=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/buff.cc  | 2 +-
 server/gameserver/human.cc | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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()) {