server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-12-25 13:46:05 +08:00
parent 4072867576
commit b0d9768b37
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/creature.cc
View File

@ -2818,6 +2818,7 @@ void Creature::OnLand()
}, },
&xtimer_attacher); &xtimer_attacher);
} }
AdjustMobaBornDir();
} }
void Creature::CheckBulletHitHoldShield(IBullet* bullet, bool& eat) void Creature::CheckBulletHitHoldShield(IBullet* bullet, bool& eat)
@ -3908,5 +3909,7 @@ void Creature::SpecShot(const glm::vec3& pos, int max_bullet)
void Creature::AdjustMobaBornDir() void Creature::AdjustMobaBornDir()
{ {
if (!room->IsMobaModeRoom()) {
return;
}
} }

3
server/gameserver/human.cc
View File

@ -3431,7 +3431,7 @@ void Human::InternalBeKill(int killer_id, const std::string& killer_name, int we
GetTrigger()->Die(killer_id, weapon_id); GetTrigger()->Die(killer_id, weapon_id);
OnDie(); OnDie();
KillMgr::Instance()->OnHumanDead(this, &info); 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); a8::SetBitFlag(status, CS_Reviving);
dead_timer = room->xtimer.SetTimeoutWpEx dead_timer = room->xtimer.SetTimeoutWpEx
(mt::Param::s().moba_revive_time * SERVER_FRAME_RATE, (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; real_dead = false;
downed = false; downed = false;
SetHP(GetMaxHP()); SetHP(GetMaxHP());
AdjustMobaBornDir();
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
room->frame_event.AddRevive(GetWeakPtrRef()); room->frame_event.AddRevive(GetWeakPtrRef());
{ {