From 4bcc8078d734ccf166533e504db703ded6968339 Mon Sep 17 00:00:00 2001 From: treeston Date: Thu, 25 Aug 2016 23:04:21 +0200 Subject: Entities/Creature: Add arg2 to DespawnOrUnsummon to allow overriding respawn time. This matches changes that will be merged as part of dynamic spawning, allowing scripts to transition early. --- src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/server/game/AI/ScriptedAI') diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 316a9704cac..9fb8608241c 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -573,16 +573,7 @@ void BossAI::_DespawnAtEvade(uint32 delayToRespawn, Creature* who) return; } - uint32 corpseDelay = who->GetCorpseDelay(); - uint32 respawnDelay = who->GetRespawnDelay(); - - who->SetCorpseDelay(1); - who->SetRespawnDelay(delayToRespawn - 1); - - who->DespawnOrUnsummon(); - - who->SetCorpseDelay(corpseDelay); - who->SetRespawnDelay(respawnDelay); + me->DespawnOrUnsummon(0, Seconds(delayToRespawn)); if (instance && who == me) instance->SetBossState(_bossId, FAIL); -- cgit v1.2.3