nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-22 21:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Creature): Fix bosses with hard reset flag not respawning an… (#14862)

Browse Source
This commit is contained in:
Skjalf
2023-02-04 15:35:53 -03:00
committed by GitHub
parent c08a5ba3fa
commit 8aa331b432
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
View File

@@ -554,6 +554,19 @@ BossAI::BossAI(Creature* creature, uint32 bossId) : ScriptedAI(creature),
SetBoundary(instance->GetBossBoundary(bossId));
}
bool BossAI::CanRespawn()
{
if (instance)
{
if (instance->GetBossState(_bossId) == DONE)
{
return false;
}
}
return true;
}
void BossAI::_Reset()
{
if (!me->IsAlive())

2
src/server/game/AI/ScriptedAI/ScriptedCreature.h
View File

@@ -438,6 +438,8 @@ public:
InstanceScript* const instance;
bool CanRespawn() override;
void JustSummoned(Creature* summon) override;
void SummonedCreatureDespawn(Creature* summon) override;
void SummonedCreatureDespawnAll() override;

9
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -648,15 +648,22 @@ void Creature::Update(uint32 diff)
ObjectGuid dbtableHighGuid = ObjectGuid::Create<HighGuid::Unit>(m_creatureData ? m_creatureData->id1 : GetEntry(), m_spawnId);
time_t linkedRespawntime = GetMap()->GetLinkedRespawnTime(dbtableHighGuid);
if (!linkedRespawntime) // Can respawn
CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(GetEntry());
if (!linkedRespawntime || (cInfo && cInfo->HasFlagsExtra(CREATURE_FLAG_EXTRA_HARD_RESET))) // Can respawn
Respawn();
else // the master is dead
{
ObjectGuid targetGuid = sObjectMgr->GetLinkedRespawnGuid(dbtableHighGuid);
if (targetGuid == dbtableHighGuid) // if linking self, never respawn (check delayed to next day)
{
SetRespawnTime(DAY);
}
else
{
m_respawnTime = (now > linkedRespawntime ? now : linkedRespawntime) + urand(5, MINUTE); // else copy time from master and add a little
}
SaveRespawnTime(); // also save to DB immediately
}
}