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/Creature: Fix respawn logic to call reset react state BEFORE calling Reset(). Fixes Krik'thir behavior after a wipe (and maybe some others).

Browse Source 
Fixes and closes #18011.
This commit is contained in:
treeston
2016-10-15 13:19:03 +02:00
parent 4de5a6e005
commit aab7abfd04
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1765,6 +1765,8 @@ void Creature::Respawn(bool force)
}
GetMotionMaster()->InitDefault();
//Re-initialize reactstate that could be altered by movementgenerators
InitializeReactState();
//Call AI respawn virtual function
if (IsAIEnabled)
@@ -1777,9 +1779,6 @@ void Creature::Respawn(bool force)
uint32 poolid = GetSpawnId() ? sPoolMgr->IsPartOfAPool<Creature>(GetSpawnId()) : 0;
if (poolid)
sPoolMgr->UpdatePool<Creature>(poolid, GetSpawnId());
//Re-initialize reactstate that could be altered by movementgenerators
InitializeReactState();
}
UpdateObjectVisibility();

19
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
View File

@@ -138,10 +138,10 @@ class boss_krik_thir : public CreatureScript
for (uint8 i = 1; i <= 3; ++i)
{
std::list<TempSummon*> summons;
me->SummonCreatureGroup(i, &summons);
for (TempSummon* summon : summons)
summon->AI()->SetData(DATA_PET_GROUP, i);
std::list<TempSummon*> adds;
me->SummonCreatureGroup(i, &adds);
for (TempSummon* add : adds)
add->AI()->SetData(DATA_PET_GROUP, i);
}
}
@@ -416,10 +416,7 @@ class npc_watcher_gashra : public CreatureScript
struct npc_watcher_gashraAI : public npc_gatewatcher_petAI
{
npc_watcher_gashraAI(Creature* creature) : npc_gatewatcher_petAI(creature, true)
{
me->SetReactState(REACT_PASSIVE);
}
npc_watcher_gashraAI(Creature* creature) : npc_gatewatcher_petAI(creature, true) { }
void Reset() override
{
@@ -928,11 +925,15 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader
void HandleTargets(std::list<WorldObject*>& targetList)
{
// Remove any Watchers that are already in combat
for (std::list<WorldObject*>::iterator it = targetList.begin(); it != targetList.end(); ++it)
auto it = targetList.begin();
while (it != targetList.end())
{
if (Creature* creature = (*it)->ToCreature())
if (creature->IsAlive() && !creature->IsInCombat())
{
++it;
continue;
}
it = targetList.erase(it);
}