From b0d9768b37e093a2f3ef7ccaad11827af7d6916f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 25 Dec 2023 13:46:05 +0800 Subject: [PATCH] 1 --- server/gameserver/creature.cc | 5 ++++- server/gameserver/human.cc | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 995d7a3d..cc573b70 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -2818,6 +2818,7 @@ void Creature::OnLand() }, &xtimer_attacher); } + AdjustMobaBornDir(); } void Creature::CheckBulletHitHoldShield(IBullet* bullet, bool& eat) @@ -3908,5 +3909,7 @@ void Creature::SpecShot(const glm::vec3& pos, int max_bullet) void Creature::AdjustMobaBornDir() { - + if (!room->IsMobaModeRoom()) { + return; + } } diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index cde3b6a2..b9a3f00a 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -3431,7 +3431,7 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we GetTrigger()->Die(killer_id, weapon_id); OnDie(); KillMgr::Instance()->OnHumanDead(this, &info); - room->frame_event.AddDead(GetWeakPtrRef(), mt::Param::s().moba_revive_time); + room->frame_event.AddDead(GetWeakPtrRef(), mt::Param::s().moba_revive_time * 1000); a8::SetBitFlag(status, CS_Reviving); dead_timer = room->xtimer.SetTimeoutWpEx (mt::Param::s().moba_revive_time * SERVER_FRAME_RATE, @@ -3452,6 +3452,7 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we real_dead = false; downed = false; SetHP(GetMaxHP()); + AdjustMobaBornDir(); SyncAroundPlayers(__FILE__, __LINE__, __func__); room->frame_event.AddRevive(GetWeakPtrRef()); {