Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/BossAI: Remove _DespawnAtEvade(uint32, Creature*) overload

Browse Source 
Use _DespawnAtEvade(Seconds,  Creature*) instead

(cherry picked from commit 27229c10cd)
This commit is contained in:
Carbenium
2020-07-25 20:46:24 +02:00
committed by Shauren
parent 5f296fb7c7
commit da438c73e2
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,10 +599,10 @@ bool BossAI::CanAIAttack(Unit const* target) const
void BossAI::_DespawnAtEvade(Seconds delayToRespawn /*= 30s*/, Creature* who /*= nullptr*/)
{
if (delayToRespawn < Seconds(2))
if (delayToRespawn < 2s)
{
TC_LOG_ERROR("scripts.ai", "BossAI::_DespawnAtEvade: called with delay of " SI64FMTD " seconds, defaulting to 2 (me: %s)", delayToRespawn.count(), me->GetGUID().ToString().c_str());
delayToRespawn = Seconds(2);
delayToRespawn = 2s;
}
if (!who)

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

@@ -340,8 +340,7 @@ class TC_GAME_API BossAI : public ScriptedAI
void _JustEngagedWith(Unit* who);
void _JustDied();
void _JustReachedHome();
void _DespawnAtEvade(Seconds delayToRespawn, Creature* who = nullptr);
void _DespawnAtEvade(uint32 delayToRespawn = 30, Creature* who = nullptr) { _DespawnAtEvade(Seconds(delayToRespawn), who); }
void _DespawnAtEvade(Seconds delayToRespawn = 30s, Creature* who = nullptr);
void TeleportCheaters();

4
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
View File

@@ -261,8 +261,8 @@ public:
me->GetCreatureListWithEntryInGrid(triggers, NPC_WORLDTRIGGER_LARGE);
for (Creature* trigger : triggers)
if (trigger->HasAura(SPELL_SUMMON_CHAMPION_PERIODIC) || trigger->HasAura(SPELL_WEB_FRONT_DOORS) || trigger->HasAura(SPELL_WEB_SIDE_DOORS))
_DespawnAtEvade(25, trigger);
_DespawnAtEvade(25);
_DespawnAtEvade(25s, trigger);
_DespawnAtEvade(25s);
summons.DespawnAll();
for (ObjectGuid gNerubian : _anubar)
if (Creature* nerubian = ObjectAccessor::GetCreature(*me, gNerubian))