This commit is contained in:
aozhiwei 2020-01-07 10:18:05 +08:00
parent 80088735d1
commit 0b9d2ff653

View File

@ -1104,10 +1104,12 @@ void Player::_CMRevive(f8::MsgHdr& hdr, const cs::CMRevive& msg)
void Player::_CMCancelRevive(f8::MsgHdr& hdr, const cs::CMCancelRevive& msg)
{
if (dead && !real_dead) {
if (dead && revive_timer && !real_dead) {
dead = true;
real_dead = true;
downed = false;
OnDie();
room->xtimer.DeleteTimer(revive_timer);
revive_timer = nullptr;
}
}