From ef26f6e56a07ec0829e45dd0d04aef0c203d7c9d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 17 Apr 2019 13:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=91=E4=BA=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/human.cc  | 8 ++++++++
 server/gameserver/player.cc | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index cc9ce9f..1677d3b 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -487,6 +487,14 @@ void Human::BeKill(int killer_id, const std::string& killer_name)
         send_gameover = true;
         room->OnHumanDie(this);
         SyncAroundPlayers();
+        if (team_members) {
+            for (auto& hum : *team_members) {
+                if (hum != this && hum->action_type == AT_Relive &&
+                    hum->action_target_id == entity_uniid) {
+                    hum->CancelAction();
+                }
+            }
+        }
     }
 }
 
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index ab02be1..b44ff68 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -267,7 +267,7 @@ void Player::UpdateAction()
                         room->xtimer.DeleteTimer(hum->downed_timer);
                         hum->downed_timer = nullptr;
                     }
-                    SyncAroundPlayers();
+                    hum->SyncAroundPlayers();
                 }
             }
             break;