From 9125634376e7bff7cbcd8b9e5266d8c691e4b79e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 22 Nov 2022 11:42:10 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc  | 3 ++-
 server/gameserver/player.cc | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index e83f09e1..0f773247 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -4677,8 +4677,8 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we
             downed = false;
             SetHP(0.0f);
             KillMgr::Instance()->OnHumanDead(this, &info);
-            room->frame_event.AddDead(GetWeakPtrRef(), 1000 * 15);
             if (GetBattleContext()->GetReviveCoin() > 0) {
+                room->frame_event.AddDead(GetWeakPtrRef(), 1000 * MetaMgr::Instance()->revive_time);
                 dead_timer = room->xtimer.AddDeadLineTimerAndAttach
                     (MetaMgr::Instance()->revive_time * SERVER_FRAME_RATE,
                      a8::XParams()
@@ -4695,6 +4695,7 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we
                          hum->dead_timer = nullptr;
                      });
             } else {
+                room->frame_event.AddDead(GetWeakPtrRef(), 0);
                 real_dead = true;
             }
         } else  {
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 37848990..da3dcce6 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1501,7 +1501,7 @@ void Player::InternalRevive(int target_uniid, int revive_coin)
     if (room->IsGameOver()) {
         return;
     }
-    if (dead) {
+    if (!dead) {
         return;
     }
     GetBattleContext()->SetReviveCoin(revive_coin);