From 89357f5425355c99648bcb142a8dc7cec9bcd132 Mon Sep 17 00:00:00 2001 From: treeston Date: Sun, 13 Sep 2015 22:02:38 +0200 Subject: Core/Creature: Add facilities to the Creature class to allow setting an automated, periodic pulse that puts every player in the zone in combat and on the creature's threat list. Scripts/BossAI: Set the BossAI parent class to make use of this in its _EnterCombat and _Reset methods. Combat pulses happen every 5 seconds. (cherry picked from commit d57193df444b719757ae1da4a5f19e204074f6ae) # Conflicts: # src/server/game/AI/ScriptedAI/ScriptedCreature.cpp # src/server/game/Entities/Creature/Creature.cpp --- src/server/game/AI/ScriptedAI/ScriptedCreature.cpp | 2 ++ 1 file changed, 2 insertions(+) (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 b38ddcf11bc..512385a67b6 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -453,6 +453,7 @@ void BossAI::_Reset() if (!me->IsAlive()) return; + me->SetCombatPulseDelay(0); me->ResetLootMode(); events.Reset(); summons.DespawnAll(); @@ -470,6 +471,7 @@ void BossAI::_JustDied() void BossAI::_EnterCombat() { + me->SetCombatPulseDelay(5); me->setActive(true); DoZoneInCombat(); if (instance) -- cgit v1.2.3