josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/AI: 06443e3 followup

Browse Source 
cause its not "that" horrible

(cherry picked from commit a71c5f4c7f35b074397abfcc9b925e80720f8c75)
This commit is contained in:
ccrs
2021-12-18 23:03:00 +01:00
committed by Shauren
parent dfb2221552
commit d3ddb3726a
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+16 -4
View File
@@ -515,14 +515,26 @@ void BossAI::TeleportCheaters()
}
}
void BossAI::ForceStopCombatForCreature(uint32 entry, float maxSearchRange /*= 250.0f*/)
void BossAI::ForceCombatStopForCreatureEntry(uint32 entry, float maxSearchRange /*= 250.0f*/, bool reset /*= true*/)
{
TC_LOG_WARN("scripts.ai", "BossAI::ForceStopCombatForCreature: called on '%s' with creature entry '%u'. This should be fixed in another way than calling this function. Debug info: %s", me->GetName().c_str(), entry, me->GetDebugInfo().c_str());
TC_LOG_DEBUG("scripts.ai", "BossAI::ForceCombatStopForCreatureEntry: called on '%s'. Debug info: %s", me->GetGUID().ToString().c_str(), me->GetDebugInfo().c_str());
std::list<Creature*> creatures;
me->GetCreatureListWithEntryInGrid(creatures, entry, maxSearchRange);
for (Creature* creature : creatures)
creature->CombatStop();
for (Creature* creature : creatures) {
creature->CombatStop(true);
creature->DoNotReacquireSpellFocusTarget();
creature->GetMotionMaster()->Clear(MOTION_PRIORITY_NORMAL);
if (reset) {
creature->LoadCreaturesAddon();
creature->SetLootRecipient(nullptr);
creature->ResetPlayerDamageReq();
creature->SetLastDamagedTime(0);
creature->SetCannotReachTarget(false);
}
}
}
void BossAI::JustSummoned(Creature* summon)
src/server/game/AI/ScriptedAI/ScriptedCreature.h
+1 -1
View File
@@ -338,7 +338,7 @@ class TC_GAME_API BossAI : public ScriptedAI
void TeleportCheaters();
void ForceStopCombatForCreature(uint32 entry, float maxSearchRange = 250.0f);
void ForceCombatStopForCreatureEntry(uint32 entry, float maxSearchRange = 250.0f, bool reset = true);
EventMap events;
SummonList summons;
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ class boss_kologarn : public CreatureScript
me->GetMotionMaster()->MoveTargetedHome();
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->SetCorpseDelay(604800); // Prevent corpse from despawning.
ForceStopCombatForCreature(NPC_ARM_SWEEP_STALKER, 500.f);
ForceCombatStopForCreatureEntry(NPC_ARM_SWEEP_STALKER, 500.f);
_JustDied();
}