From 6c0c60f28916f72aeba7a4a45f8e790f094b57b4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 17 Apr 2019 11:58:37 +0800 Subject: [PATCH] 1 --- server/gameserver/player.cc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 2f9acde..ab02be1 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -246,24 +246,6 @@ void Player::UpdateAction() } } break; - case AT_Relive: - { - Entity* entity = room->GetEntityByUniId(action_target_id); - if (entity->entity_type != ET_Player) { - return; - } - Human* hum = (Human*)entity; - if (!hum->dead && hum->downed) { - hum->health = MetaMgr::Instance()->GetSysParamAsInt("downed_relive_recover_hp"); - hum->downed = false; - if (hum->downed_timer) { - room->xtimer.DeleteTimer(hum->downed_timer); - hum->downed_timer = nullptr; - } - SyncAroundPlayers(); - } - } - break; default: { } @@ -271,6 +253,24 @@ void Player::UpdateAction() } } break; + case AT_Relive: + { + Entity* entity = room->GetEntityByUniId(action_target_id); + if (entity->entity_type != ET_Player) { + return; + } + Human* hum = (Human*)entity; + if (!hum->dead && hum->downed) { + hum->health = MetaMgr::Instance()->GetSysParamAsInt("downed_relive_recover_hp"); + hum->downed = false; + if (hum->downed_timer) { + room->xtimer.DeleteTimer(hum->downed_timer); + hum->downed_timer = nullptr; + } + SyncAroundPlayers(); + } + } + break; } ResetAction(); }