From b61e7603983fc6f09e2c839309ff52163415bb1c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 15 Sep 2022 19:41:23 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc | 20 ++++++++++----------
 server/gameserver/human.h  |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 364e3be2..69f5136b 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1779,19 +1779,19 @@ void Human::SendUpdateMsg()
 void Human::SendGameOver()
 {
     if (IsEntitySubType(EST_Player)) {
-        //!!!必须要在SendNotifyMsg之前注意哦
-        if (!sent_battlereport_) {
-            SendBattleReport();
-            sent_battlereport_ = true;
-            GameLog::Instance()->GameEnd((Player*)this);
-        }
-        {
+        if (already_report_battle_) {
             cs::SMGameOver msg;
             FillSMGameOver(msg);
             SendNotifyMsg(msg);
-            #ifdef DEBUG
-            a8::XPrintf("SendGameOver socket_handle:%d\n", {socket_handle});
-            #endif
+        } else {
+            if (!sending_battlereport_) {
+                sending_battlereport_ = true;
+                SendBattleReport();
+            }
+            if (!is_game_end_) {
+                GameLog::Instance()->GameEnd((Player*)this);
+                is_game_end_ = true;
+            }
         }
     }
 }
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 259a2c67..a3e07230 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -423,8 +423,8 @@ private:
     std::array<ObjectSyncFlags, FIXED_OBJECT_MAXID> fixed_object_sync_flags_ = {};
 
     bool already_report_battle_ = false;
-    bool sent_battlereport_ = false;
-    bool sent_game_end_ = false;
+    bool sending_battlereport_ = false;
+    bool is_game_end_ = false;
 
     long long jump_frameno_ = 0;
     float old_sync_speed = 0;