sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core): Rename ...Manager to ...Mgr (#6910)

Browse Source 
* Rename MapManager.h to MapMgr.h

* Rename BanManager.h to BanMgr.h

* Rename MapManager.cpp to MapMgr.cpp

* Rename BanManager.cpp to BanMgr.cpp

* Rename MapRefManager.h to MapRefMgr.h

* Rename ThreatManager.h to ThreatMgr.h

* Rename GridRefManager.h to GridRefMgr.h

* Rename ThreatManager.cpp to ThreatMgr.cpp

* Rename GroupRefManager.h to GroupRefMgr.h

* Rename HostileRefManager.h to HostileRefMgr.h

* Rename HostileRefManager.cpp to HostileRefMgr.cpp

* Rename MMapManager.h to MMapMgr.h

* Rename FollowerRefManager.h to FollowerRefMgr.h

* Rename VMapManager2.h to VMapMgr2.h

* Rename IVMapManager.h to IVMapMgr.h

* Rename MMapManager.cpp to MMapMgr.cpp

* Rename VMapManager2.cpp to VMapMgr2.cpp

* Rename RefManager.h to RefMgr.h

* Rename WaypointManager.h to WaypointMgr.h

* Rename WaypointManager.cpp to WaypointMgr.cpp

* Rename MPQManager.h to MPQMgr.h

* Rename MPQManager.cpp to MPQMgr.cpp

* Rename IMMAPManager.h to IMMAPMgr.h

* fix build

* Update Main.cpp

* chore(Core/Misc): Remove toxic language

* Revert "chore(Core/Misc): Remove toxic language"

* fix build

* build
This commit is contained in:
Kitzunu
2021-09-15 17:50:28 +02:00
committed by GitHub
parent 7e2aa2402f
commit 2f449326e0
187 changed files with 719 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_ban.cpp
+1 -1
View File
@@ -12,7 +12,7 @@ Category: commandscripts
EndScriptData */
#include "AccountMgr.h"
#include "BanManager.h"
#include "BanMgr.h"
#include "Chat.h"
#include "Language.h"
#include "ObjectAccessor.h"
src/server/scripts/Commands/cs_debug.cpp
+3 -3
View File
@@ -830,7 +830,7 @@ public:
if (!target || target->IsTotem() || target->IsPet())
return false;
ThreatContainer::StorageType const& threatList = target->getThreatManager().getThreatList();
ThreatContainer::StorageType const& threatList = target->getThreatMgr().getThreatList();
ThreatContainer::StorageType::const_iterator itr;
uint32 count = 0;
handler->PSendSysMessage("Threat list of %s (%s)", target->GetName().c_str(), target->GetGUID().ToString().c_str());
@@ -844,7 +844,7 @@ public:
}
handler->PSendSysMessage(" %u. %s (%s) - threat %f", ++count, unit->GetName().c_str(), unit->GetGUID().ToString().c_str(), (*itr)->getThreat());
}
ThreatContainer::StorageType const& threatList2 = target->getThreatManager().getOfflineThreatList();
ThreatContainer::StorageType const& threatList2 = target->getThreatMgr().getOfflineThreatList();
for (itr = threatList2.begin(); itr != threatList2.end(); ++itr)
{
Unit* unit = (*itr)->getTarget();
@@ -865,7 +865,7 @@ public:
Unit* target = handler->getSelectedUnit();
if (!target)
target = handler->GetSession()->GetPlayer();
HostileReference* ref = target->getHostileRefManager().getFirst();
HostileReference* ref = target->getHostileRefMgr().getFirst();
uint32 count = 0;
handler->PSendSysMessage("Hostil reference list of %s (%s)", target->GetName().c_str(), target->GetGUID().ToString().c_str());
while (ref)
src/server/scripts/Commands/cs_go.cpp
+10 -10
View File
@@ -14,7 +14,7 @@ EndScriptData */
#include "Chat.h"
#include "GameGraveyard.h"
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
@@ -135,7 +135,7 @@ public:
ort = creature->GetOrientation();
}
if (!MapManager::IsValidMapCoord(mapId, x, y, z, ort))
if (!MapMgr::IsValidMapCoord(mapId, x, y, z, ort))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
@@ -180,7 +180,7 @@ public:
return false;
}
if (!MapManager::IsValidMapCoord(gy->Map, gy->x, gy->y, gy->z))
if (!MapMgr::IsValidMapCoord(gy->Map, gy->x, gy->y, gy->z))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, gy->x, gy->y, gy->Map);
handler->SetSentErrorMessage(true);
@@ -222,7 +222,7 @@ public:
float x = ((float)atof(gridX) - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS;
float y = ((float)atof(gridY) - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS;
if (!MapManager::IsValidMapCoord(mapId, x, y))
if (!MapMgr::IsValidMapCoord(mapId, x, y))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
@@ -282,7 +282,7 @@ public:
return false;
}
if (!MapManager::IsValidMapCoord(mapId, x, y, z, ort))
if (!MapMgr::IsValidMapCoord(mapId, x, y, z, ort))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
@@ -327,7 +327,7 @@ public:
}
if ((node->x == 0.0f && node->y == 0.0f && node->z == 0.0f) ||
!MapManager::IsValidMapCoord(node->map_id, node->x, node->y, node->z))
!MapMgr::IsValidMapCoord(node->map_id, node->x, node->y, node->z))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, node->x, node->y, node->map_id);
handler->SetSentErrorMessage(true);
@@ -372,7 +372,7 @@ public:
return false;
}
if (!MapManager::IsValidMapCoord(at->map, at->x, at->y, at->z))
if (!MapMgr::IsValidMapCoord(at->map, at->x, at->y, at->z))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, at->x, at->y, at->map);
handler->SetSentErrorMessage(true);
@@ -442,7 +442,7 @@ public:
Zone2MapCoordinates(x, y, zoneEntry->ID);
if (!MapManager::IsValidMapCoord(zoneEntry->mapid, x, y))
if (!MapMgr::IsValidMapCoord(zoneEntry->mapid, x, y))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->mapid);
handler->SetSentErrorMessage(true);
@@ -491,7 +491,7 @@ public:
if (goZ)
{
z = (float)atof(goZ);
if (!MapManager::IsValidMapCoord(mapId, x, y, z))
if (!MapMgr::IsValidMapCoord(mapId, x, y, z))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
@@ -500,7 +500,7 @@ public:
}
else
{
if (!MapManager::IsValidMapCoord(mapId, x, y))
if (!MapMgr::IsValidMapCoord(mapId, x, y))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
src/server/scripts/Commands/cs_gobject.cpp
+2 -2
View File
@@ -15,7 +15,7 @@ EndScriptData */
#include "GameEventMgr.h"
#include "GameObject.h"
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "Opcodes.h"
#include "Player.h"
@@ -466,7 +466,7 @@ public:
float y = (float)atof(toY);
float z = (float)atof(toZ);
if (!MapManager::IsValidMapCoord(object->GetMapId(), x, y, z))
if (!MapMgr::IsValidMapCoord(object->GetMapId(), x, y, z))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, object->GetMapId());
handler->SetSentErrorMessage(true);
src/server/scripts/Commands/cs_instance.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ EndScriptData */
#include "InstanceSaveMgr.h"
#include "InstanceScript.h"
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
src/server/scripts/Commands/cs_misc.cpp
+2 -2
View File
@@ -18,7 +18,7 @@
#include "IPLocation.h"
#include "Language.h"
#include "LFG.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "MovementGenerator.h"
#include "ObjectAccessor.h"
#include "Opcodes.h"
@@ -2620,7 +2620,7 @@ public:
return false;
target->CombatStop();
target->getHostileRefManager().deleteReferences();
target->getHostileRefMgr().deleteReferences();
return true;
}
src/server/scripts/Commands/cs_mmaps.cpp
+6 -6
View File
@@ -49,7 +49,7 @@ public:
static bool HandleMmapPathCommand(ChatHandler* handler, char const* args)
{
if (!MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId()))
if (!MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId()))
{
handler->PSendSysMessage("NavMesh not loaded for current map.");
return true;
@@ -124,8 +124,8 @@ public:
handler->PSendSysMessage("gridloc [%i, %i]", gy, gx);
// calculate navmesh tile location
dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId());
dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMeshQuery(handler->GetSession()->GetPlayer()->GetMapId(), player->GetInstanceId());
dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId());
dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMeshQuery(handler->GetSession()->GetPlayer()->GetMapId(), player->GetInstanceId());
if (!navmesh || !navmeshquery)
{
handler->PSendSysMessage("NavMesh not loaded for current map.");
@@ -176,8 +176,8 @@ public:
static bool HandleMmapLoadedTilesCommand(ChatHandler* handler, char const* /*args*/)
{
uint32 mapid = handler->GetSession()->GetPlayer()->GetMapId();
dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(mapid);
dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMeshQuery(mapid, handler->GetSession()->GetPlayer()->GetInstanceId());
dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMesh(mapid);
dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMeshQuery(mapid, handler->GetSession()->GetPlayer()->GetInstanceId());
if (!navmesh || !navmeshquery)
{
handler->PSendSysMessage("NavMesh not loaded for current map.");
@@ -203,7 +203,7 @@ public:
handler->PSendSysMessage("mmap stats:");
//handler->PSendSysMessage(" global mmap pathfinding is %sabled", DisableMgr::IsPathfindingEnabled(mapId) ? "en" : "dis");
MMAP::MMapManager* manager = MMAP::MMapFactory::createOrGetMMapManager();
MMAP::MMapMgr* manager = MMAP::MMapFactory::createOrGetMMapMgr();
handler->PSendSysMessage(" %u maps loaded with %u tiles overall", manager->getLoadedMapsCount(), manager->getLoadedTilesCount());
dtNavMesh const* navmesh = manager->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId());
src/server/scripts/Commands/cs_reload.cpp
+2 -2
View File
@@ -20,7 +20,7 @@ EndScriptData */
#include "GameGraveyard.h"
#include "Language.h"
#include "LFGMgr.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "ScriptMgr.h"
#include "SkillDiscovery.h"
@@ -29,7 +29,7 @@ EndScriptData */
#include "SpellMgr.h"
#include "TicketMgr.h"
#include "WardenCheckMgr.h"
#include "WaypointManager.h"
#include "WaypointMgr.h"
#include "StringConvert.h"
#include "Tokenize.h"
src/server/scripts/Commands/cs_server.cpp
+3 -3
View File
@@ -23,7 +23,7 @@ EndScriptData */
#include "ServerMotd.h"
#include "StringConvert.h"
#include "VMapFactory.h"
#include "VMapManager2.h"
#include "VMapMgr2.h"
#include <filesystem>
#include <boost/version.hpp>
#include <openssl/crypto.h>
@@ -126,8 +126,8 @@ public:
handler->PSendSysMessage("%s", dbPortOutput.c_str());
bool vmapIndoorCheck = sWorld->getBoolConfig(CONFIG_VMAP_INDOOR_CHECK);
bool vmapLOSCheck = VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled();
bool vmapHeightCheck = VMAP::VMapFactory::createOrGetVMapManager()->isHeightCalcEnabled();
bool vmapLOSCheck = VMAP::VMapFactory::createOrGetVMapMgr()->isLineOfSightCalcEnabled();
bool vmapHeightCheck = VMAP::VMapFactory::createOrGetVMapMgr()->isHeightCalcEnabled();
bool mmapEnabled = sWorld->getBoolConfig(CONFIG_ENABLE_MMAPS);
src/server/scripts/Commands/cs_tele.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ EndScriptData */
#include "Chat.h"
#include "Group.h"
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
src/server/scripts/Commands/cs_wp.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ EndScriptData */
#include "ObjectMgr.h"
#include "Player.h"
#include "ScriptMgr.h"
#include "WaypointManager.h"
#include "WaypointMgr.h"
class wp_commandscript : public CommandScript
{
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ public:
}
// aggro target if Red Beam
if (j == RED_PORTAL && me->GetVictim() != target && target->GetTypeId() == TYPEID_PLAYER)
me->getThreatManager().addThreat(target, 100000.0f + DoGetThreat(me->GetVictim()));
me->getThreatMgr().addThreat(target, 100000.0f + DoGetThreat(me->GetVictim()));
}
}
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+1 -1
View File
@@ -240,7 +240,7 @@ public:
if (!info)
return;
ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList();
std::vector<Unit*> targets;
if (t_list.empty())
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ public:
void FlameWreathEffect()
{
std::vector<Unit*> targets;
ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList();
if (t_list.empty())
return;
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+1 -1
View File
@@ -380,7 +380,7 @@ public:
void HandleDummy(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
GetCaster()->getThreatManager().resetAllAggro();
GetCaster()->getThreatMgr().resetAllAggro();
if (Unit* target = GetHitUnit())
GetCaster()->CastSpell(target, SPELL_BLINK, true);
}
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+5 -5
View File
@@ -286,15 +286,15 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
void RecalculateThreat()
{
ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList();
for( ThreatContainer::StorageType::const_iterator itr = tList.begin(); itr != tList.end(); ++itr )
{
Unit* pUnit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatManager().getThreat(pUnit) )
if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatMgr().getThreat(pUnit) )
{
float threatMod = GetThreatMod(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth(), pUnit->GetMaxHealth(), pUnit);
me->getThreatManager().modifyThreatPercent(pUnit, -100);
if (HostileReference* ref = me->getThreatManager().getOnlineContainer().getReferenceByTarget(pUnit))
me->getThreatMgr().modifyThreatPercent(pUnit, -100);
if (HostileReference* ref = me->getThreatMgr().getOnlineContainer().getReferenceByTarget(pUnit))
ref->addThreat(10000000.0f * threatMod);
}
}
@@ -728,7 +728,7 @@ public:
case EVENT_SPELL_BLINK:
{
bool InMeleeRange = false;
ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList();
for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
if (target->IsWithinMeleeRange(me))
src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+1 -1
View File
@@ -534,7 +534,7 @@ public:
Unit* SelectUnitCasting()
{
ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList();
for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+2 -2
View File
@@ -315,7 +315,7 @@ public:
return;
// Now lets get archimode threat list
ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList();
if (t_list.empty())
return;
@@ -425,7 +425,7 @@ public:
if (victim && me->IsWithinMeleeRange(victim))
return false;
ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList();
if (threatlist.empty())
return false;
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ public:
{
std::list<Unit*> targetList;
{
const std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList();
const std::list<HostileReference*>& threatlist = me->getThreatMgr().getThreatList();
for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
if ((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && (*itr)->getTarget()->getPowerType() == POWER_MANA)
targetList.push_back((*itr)->getTarget());
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+1 -1
View File
@@ -648,7 +648,7 @@ public:
//Place all units in threat list on outside of stomach
Stomach_Map.clear();
for (std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i)
for (std::list<HostileReference*>::const_iterator i = me->getThreatMgr().getThreatList().begin(); i != me->getThreatMgr().getThreatList().end(); ++i)
Stomach_Map[(*i)->getUnitGuid()] = false; //Outside stomach
//Spawn 2 flesh tentacles
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+1 -1
View File
@@ -404,7 +404,7 @@ public:
void CastSpellOnBug(Creature* target) override
{
target->setFaction(14);
target->AI()->AttackStart(me->getThreatManager().getHostilTarget());
target->AI()->AttackStart(me->getThreatMgr().getHostilTarget());
target->AddAura(SPELL_MUTATE_BUG, target);
target->SetFullHealth();
}
src/server/scripts/Kalimdor/boss_azuregos.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ public:
if (TeleportTimer <= diff)
{
Talk(SAY_TELEPORT);
ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList();
for (auto i = threatlist.begin(); i != threatlist.end(); ++i)
{
Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
src/server/scripts/Kalimdor/zone_silithus.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ quest_a_pawn_on_the_eternal_pawn
EndContentData */
#include "AccountMgr.h"
#include "BanManager.h"
#include "BanMgr.h"
#include "Group.h"
#include "Player.h"
#include "ScriptedCreature.h"
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+1 -1
View File
@@ -414,7 +414,7 @@ public:
{
//Count alive players
uint8 count = 0;
std::list<HostileReference*> const t_list = me->getThreatManager().getThreatList();
std::list<HostileReference*> const t_list = me->getThreatMgr().getThreatList();
if (!t_list.empty())
{
for (HostileReference const* reference : t_list)
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*/
#include "GameObjectAI.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "Player.h"
#include "ruby_sanctum.h"
#include "ScriptedCreature.h"
@@ -1145,7 +1145,7 @@ public:
GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
GetTarget()->ToCreature()->SetReactState(REACT_DEFENSIVE);
GetTarget()->GetMotionMaster()->Clear();
GetTarget()->getThreatManager().clearReferences();
GetTarget()->getThreatMgr().clearReferences();
GetTarget()->RemoveAllAttackers();
GetTarget()->AttackStop();
}
@@ -1155,7 +1155,7 @@ public:
GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
GetTarget()->ToCreature()->SetReactState(REACT_DEFENSIVE);
GetTarget()->GetMotionMaster()->Clear();
GetTarget()->getThreatManager().clearReferences();
GetTarget()->getThreatMgr().clearReferences();
GetTarget()->RemoveAllAttackers();
GetTarget()->AttackStop();
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+2 -2
View File
@@ -142,7 +142,7 @@ public:
me->setFaction(35);
events.Reset();
Talk(TEXT_EADRIC_DEATH);
me->getThreatManager().clearReferences();
me->getThreatMgr().clearReferences();
me->SetRegeneratingHealth(false);
_EnterEvadeMode();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -289,7 +289,7 @@ public:
me->setFaction(35);
events.Reset();
Talk(TEXT_PALETRESS_DEATH);
me->getThreatManager().clearReferences();
me->getThreatMgr().clearReferences();
me->SetRegeneratingHealth(false);
_EnterEvadeMode();
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+3 -3
View File
@@ -146,7 +146,7 @@ public:
void Reset() override
{
me->SetReactState(REACT_PASSIVE);
me->getHostileRefManager().setOnlineOfflineState(false);
me->getHostileRefMgr().setOnlineOfflineState(false);
}
void OnCharmed(bool apply) override
@@ -283,7 +283,7 @@ public:
uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0;
if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) )
{
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->AddThreat(target, 10000.0f);
AttackStart(target);
me->CastSpell(target, SPELL_MINIONS_CHARGE, false);
@@ -736,7 +736,7 @@ public:
uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0;
if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) )
{
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->AddThreat(target, 10000.0f);
AttackStart(target);
me->CastSpell(target, SPELL_MINIONS_CHARGE, false);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+7 -7
View File
@@ -89,16 +89,16 @@ struct boss_faction_championsAI : public ScriptedAI
void RecalculateThreat()
{
ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList();
for( ThreatContainer::StorageType::const_iterator itr = tList.begin(); itr != tList.end(); ++itr )
{
Unit* pUnit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatManager().getThreat(pUnit) )
if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatMgr().getThreat(pUnit) )
{
float threatMod = GetThreatMod(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth(), pUnit->GetMaxHealth(), pUnit);
me->getThreatManager().modifyThreatPercent(pUnit, -100);
//me->getThreatManager().doAddThreat(pUnit, 10000000.0f * threatMod);
if (HostileReference* ref = me->getThreatManager().getOnlineContainer().getReferenceByTarget(pUnit))
me->getThreatMgr().modifyThreatPercent(pUnit, -100);
//me->getThreatMgr().doAddThreat(pUnit, 10000000.0f * threatMod);
if (HostileReference* ref = me->getThreatMgr().getOnlineContainer().getReferenceByTarget(pUnit))
ref->addThreat(10000000.0f * threatMod);
}
}
@@ -164,7 +164,7 @@ struct boss_faction_championsAI : public ScriptedAI
uint32 EnemiesInRange(float distance)
{
ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList();
uint32 count = 0;
Unit* target;
for( ThreatContainer::StorageType::const_iterator iter = tList.begin(); iter != tList.end(); ++iter )
@@ -178,7 +178,7 @@ struct boss_faction_championsAI : public ScriptedAI
Unit* SelectEnemyCaster(bool casting, float range)
{
ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList();
Unit* target;
for( ThreatContainer::StorageType::const_iterator iter = tList.begin(); iter != tList.end(); ++iter )
{
src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+2 -2
View File
@@ -148,7 +148,7 @@ public:
if (me->HealthBelowPct(50))
{
Talk(SAY_FLESH);
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->CastSpell((Unit*)nullptr, SPELL_TURN_FLESH, false);
events.Reset();
@@ -244,7 +244,7 @@ public:
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
PreventDefaultAction();
GetUnitOwner()->getThreatManager().resetAllAggro();
GetUnitOwner()->getThreatMgr().resetAllAggro();
GetUnitOwner()->GetMotionMaster()->Clear();
GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_TURN_BONES, false);
GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES);
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*/
#include "halls_of_reflection.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "Transport.h"
class UtherBatteredHiltEvent : public BasicEvent
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*/
#include "CreatureGroups.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "PassiveAI.h"
#include "pit_of_saron.h"
#include "Player.h"
src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ public:
case EVENT_ECK_SPRING:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true))
{
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->AddThreat(target, 500.0f);
me->CastSpell(target, SPELL_ECK_SPRING, false);
}
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+1 -1
View File
@@ -322,7 +322,7 @@ public:
if (Player* p = itr->GetSource())
if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && p->GetDistance(me) < 70.0f)
{
float th = me->getThreatManager().getThreatWithoutTemp(p);
float th = me->getThreatMgr().getThreatWithoutTemp(p);
if (!target || th > maxThreat)
{
target = p;
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+2 -2
View File
@@ -286,7 +286,7 @@ public:
if (events.GetPhaseMask() & PHASE_ONE_MASK && damage >= me->GetPower(POWER_MANA))
{
// reset threat
ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList();
for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
Unit* unit = ObjectAccessor::GetUnit((*me), (*itr)->getUnitGuid());
@@ -917,7 +917,7 @@ public:
ScriptedAI::AttackStart(who);
if (!targetGUID)
{
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->AddThreat(who, 1000000.0f);
targetGUID = who->GetGUID();
}
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*/
#include "icecrown_citadel.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "PassiveAI.h"
#include "Player.h"
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+2 -2
View File
@@ -485,7 +485,7 @@ public:
bool Execute(uint64 /*time*/, uint32 /*diff*/) override
{
_owner->SetReactState(REACT_AGGRESSIVE);
if (!_owner->getThreatManager().isThreatListEmpty())
if (!_owner->getThreatMgr().isThreatListEmpty())
if (Unit* target = _owner->SelectVictim())
_owner->AI()->AttackStart(target);
if (!_owner->GetVictim())
@@ -2366,7 +2366,7 @@ public:
{
me->SetControlled(false, UNIT_STATE_ROOT);
if (!me->getThreatManager().isThreatListEmpty())
if (!me->getThreatMgr().isThreatListEmpty())
if (Unit* target = me->SelectVictim())
AttackStart(target);
if (!me->GetVictim())
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+1 -1
View File
@@ -572,7 +572,7 @@ public:
{
checkTimer = 3000;
me->SetInCombatWithZone();
ThreatContainer::StorageType const& threatList = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& threatList = me->getThreatMgr().getThreatList();
if (!threatList.empty())
for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
if (Unit* target = (*itr)->getTarget())
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+5 -5
View File
@@ -1761,15 +1761,15 @@ public:
me->GetPosition(&myPos);
me->NearTeleportTo(c->GetPositionX(), c->GetPositionY(), c->GetPositionZ(), c->GetOrientation());
c->NearTeleportTo(myPos.GetPositionX(), myPos.GetPositionY(), myPos.GetPositionZ(), myPos.GetOrientation());
const ThreatContainer::StorageType me_tl = me->getThreatManager().getThreatList();
const ThreatContainer::StorageType target_tl = c->getThreatManager().getThreatList();
const ThreatContainer::StorageType me_tl = me->getThreatMgr().getThreatList();
const ThreatContainer::StorageType target_tl = c->getThreatMgr().getThreatList();
DoResetThreat();
for (ThreatContainer::StorageType::const_iterator iter = target_tl.begin(); iter != target_tl.end(); ++iter)
me->getThreatManager().addThreat((*iter)->getTarget(), (*iter)->getThreat());
me->getThreatMgr().addThreat((*iter)->getTarget(), (*iter)->getThreat());
c->getThreatManager().resetAllAggro();
c->getThreatMgr().resetAllAggro();
for (ThreatContainer::StorageType::const_iterator iter = me_tl.begin(); iter != me_tl.end(); ++iter)
c->getThreatManager().addThreat((*iter)->getTarget(), (*iter)->getThreat());
c->getThreatMgr().addThreat((*iter)->getTarget(), (*iter)->getThreat());
}
}
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+2 -2
View File
@@ -436,10 +436,10 @@ public:
{
me->CastSpell(me, SPELL_TELEPORT_LIVE, false);
}
me->getThreatManager().resetAggro(NotOnSameSide(me));
me->getThreatMgr().resetAggro(NotOnSameSide(me));
if (Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0))
{
me->getThreatManager().addThreat(pTarget, 100.0f);
me->getThreatMgr().addThreat(pTarget, 100.0f);
AttackStart(pTarget);
}
events.RepeatEvent(20000);
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+1 -1
View File
@@ -425,7 +425,7 @@ public:
case EVENT_DETONATE_MANA:
{
std::vector<Unit*> unitList;
ThreatContainer::StorageType const& threatList = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& threatList = me->getThreatMgr().getThreatList();
for (auto itr : threatList)
{
if (itr->getTarget()->GetTypeId() == TYPEID_PLAYER
src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+2 -2
View File
@@ -115,8 +115,8 @@ public:
std::list<Unit*> meleeRangeTargets;
Unit* finalTarget = nullptr;
uint8 counter = 0;
auto i = me->getThreatManager().getThreatList().begin();
for (; i != me->getThreatManager().getThreatList().end(); ++i, ++counter)
auto i = me->getThreatMgr().getThreatList().begin();
for (; i != me->getThreatMgr().getThreatList().end(); ++i, ++counter)
{
// Gather all units with melee range
Unit* target = (*i)->getTarget();
src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+2 -2
View File
@@ -308,8 +308,8 @@ public:
}
std::vector<Unit*> targets;
auto i = me->getThreatManager().getThreatList().begin();
for (; i != me->getThreatManager().getThreatList().end(); ++i)
auto i = me->getThreatMgr().getThreatList().begin();
for (; i != me->getThreatMgr().getThreatList().end(); ++i)
{
if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER)
{
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+4 -4
View File
@@ -541,17 +541,17 @@ public:
if (!feugen->IsAlive() || !feugen->GetVictim() || !me->GetVictim())
return;
float threatFeugen = feugen->getThreatManager().getThreat(feugen->GetVictim());
float threatStalagg = me->getThreatManager().getThreat(me->GetVictim());
float threatFeugen = feugen->getThreatMgr().getThreat(feugen->GetVictim());
float threatStalagg = me->getThreatMgr().getThreat(me->GetVictim());
Unit* tankFeugen = feugen->GetVictim();
Unit* tankStalagg = me->GetVictim();
feugen->getThreatManager().modifyThreatPercent(tankFeugen, -100);
feugen->getThreatMgr().modifyThreatPercent(tankFeugen, -100);
feugen->AddThreat(tankStalagg, threatFeugen);
feugen->CastSpell(tankStalagg, SPELL_MAGNETIC_PULL, true);
feugen->AI()->DoAction(ACTION_MAGNETIC_PULL);
me->getThreatManager().modifyThreatPercent(tankStalagg, -100);
me->getThreatMgr().modifyThreatPercent(tankStalagg, -100);
me->AddThreat(tankFeugen, threatStalagg);
me->CastSpell(tankFeugen, SPELL_MAGNETIC_PULL, true);
DoAction(ACTION_MAGNETIC_PULL);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*/
#include "GameObjectAI.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "MoveSplineInit.h"
#include "ObjectMgr.h"
#include "PassiveAI.h"
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+1 -1
View File
@@ -1655,7 +1655,7 @@ public:
if (!target || !caster)
return;
caster->getThreatManager().resetAllAggro();
caster->getThreatMgr().resetAllAggro();
caster->GetAI()->AttackStart(target); // Chase target
caster->AddThreat(target, 10000000.0f);
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*/
#include "AccountMgr.h"
#include "BanManager.h"
#include "BanMgr.h"
#include "PassiveAI.h"
#include "Player.h"
#include "ScriptedCreature.h"
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ public:
heat->ModStackAmount(-1);
}
me->CastSpell(me, SPELL_MOLTEN, true);
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
}
}
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+1 -1
View File
@@ -642,7 +642,7 @@ public:
bool operator() (WorldObject* target) const
{
if (target == _victim && _me->getThreatManager().getThreatList().size() > 1)
if (target == _victim && _me->getThreatMgr().getThreatList().size() > 1)
return true;
if (target->GetTypeId() != TYPEID_PLAYER)
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
* Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "MapManager.h"
#include "MapMgr.h"
#include "PassiveAI.h"
#include "Player.h"
#include "ScriptedCreature.h"
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "SpellAuras.h"
#include "SpellScript.h"
#include "ulduar.h"
#include "WaypointManager.h"
#include "WaypointMgr.h"
#define SPELL_FLAMEBUFFET_10 64016
#define SPELL_FLAMEBUFFET_25 64023
src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+1 -1
View File
@@ -1142,7 +1142,7 @@ public:
}
}
_playerAttack = true;
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->CallForHelp(40.0f);
AttackStart(who);
}
src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+1 -1
View File
@@ -178,7 +178,7 @@ public:
if (switchTimer >= 10000)
{
switchTimer = 0;
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
if (Player* player = SelectTargetFromPlayerList(100.0f))
me->AddThreat(player, 100000.0f);
}
src/server/scripts/Northrend/zone_sholazar_basin.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ EndContentData */
#include "SpellAuras.h"
#include "SpellScript.h"
#include "Vehicle.h"
#include "WaypointManager.h"
#include "WaypointMgr.h"
// Ours
enum songOfWindandWater
{
src/server/scripts/Northrend/zone_storm_peaks.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#include "Vehicle.h"
#include "WaypointManager.h"
#include "WaypointMgr.h"
#include "WorldSession.h"
// Ours
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "GameGraveyard.h"
#include "GameObject.h"
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectAccessor.h"
#include "ObjectMgr.h"
#include "OutdoorPvPEP.h"
src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#include "GameEventMgr.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "OutdoorPvPGH.h"
#include "OutdoorPvPMgr.h"
#include "Player.h"
src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "OutdoorPvP.h"
#include "OutdoorPvPHP.h"
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#include "GameGraveyard.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "Language.h"
#include "ObjectMgr.h"
#include "OutdoorPvPMgr.h"
src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "GameObject.h"
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "OutdoorPvPMgr.h"
#include "OutdoorPvPSI.h"
src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#include "Language.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ObjectMgr.h"
#include "OutdoorPvP.h"
#include "OutdoorPvPMgr.h"
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ public:
{
me->CastSpell(me, SPELL_INCITE_CHAOS, false);
std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
std::list<HostileReference*> t_list = me->getThreatMgr().getThreatList();
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
{
Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid());
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+1 -1
View File
@@ -137,7 +137,7 @@ public:
if (!me->IsWithinMeleeRange(me->GetVictim()))
{
ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList();
for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i)
if (Unit* target = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid()))
if (target->IsAlive() && me->IsWithinMeleeRange(target))
src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+1 -1
View File
@@ -233,7 +233,7 @@ public:
{
PreventHitEffect(effIndex);
if (Unit* target = GetHitUnit())
GetCaster()->getThreatManager().modifyThreatPercent(target, -20);
GetCaster()->getThreatMgr().modifyThreatPercent(target, -20);
}
void Register() override
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+3 -3
View File
@@ -608,7 +608,7 @@ public:
me->SetDisableGravity(false);
break;
case EVENT_START_PHASE_3_LAND:
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetTarget(me->GetVictim()->GetGUID());
AttackStart(me->GetVictim());
@@ -621,7 +621,7 @@ public:
// ///////////////////////////
case EVENT_PHASE_4_START:
me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true);
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->GetMotionMaster()->MoveChase(me->GetVictim(), 35.0f);
events.Reset();
events.ScheduleEvent(EVENT_SPELL_SHADOW_BLAST, 11000);
@@ -644,7 +644,7 @@ public:
break;
case EVENT_REMOVE_DEMON_FORM:
me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true);
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
events.Reset();
if (summons.HasEntry(NPC_MAIEV_SHADOWSONG))
{
src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ public:
Unit* FindHatefulStrikeTarget()
{
Unit* target = nullptr;
ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList();
for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i)
{
Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid());
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+1 -1
View File
@@ -342,7 +342,7 @@ public:
void HandleScriptEffect(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
GetCaster()->getThreatManager().resetAllAggro();
GetCaster()->getThreatMgr().resetAllAggro();
if (roll_chance_i(33))
if (Unit* target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ public:
target = me->GetVictim();
else
{
ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList();
for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr)
if (Unit* threatTarget = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
if (me->IsWithinMeleeRange(threatTarget))
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ public:
// Xinef: if we have target we currently follow, return
if (Unit* target = GetCaster()->GetVictim())
if (GetCaster()->getThreatManager().getThreat(target) >= 100000.0f)
if (GetCaster()->getThreatMgr().getThreat(target) >= 100000.0f)
return;
// Xinef: acquire new target
src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+2 -2
View File
@@ -6,7 +6,7 @@
#include "ScriptedCreature.h"
#include "ScriptMgr.h"
#include "the_eye.h"
#include "WaypointManager.h"
#include "WaypointMgr.h"
enum Spells
{
@@ -310,7 +310,7 @@ public:
else
{
me->resetAttackTimer();
ThreatContainer::StorageType const& threatList = me->getThreatManager().getThreatList();
ThreatContainer::StorageType const& threatList = me->getThreatMgr().getThreatList();
for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr)
if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
if (me->IsWithinMeleeRange(unit))
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+1 -1
View File
@@ -984,7 +984,7 @@ public:
{
PreventHitEffect(effIndex);
ThreatContainer::StorageType const& ThreatList = GetCaster()-> getThreatManager().getThreatList();
ThreatContainer::StorageType const& ThreatList = GetCaster()-> getThreatMgr().getThreatList();
std::list<Unit*> targetList;
for (ThreatContainer::StorageType::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
{
src/server/scripts/Outland/zone_netherstorm.cpp
+1 -1
View File
@@ -1742,7 +1742,7 @@ public:
// some code to cast spell Mana Burn on random target which has mana
if (ManaBurnTimer <= diff)
{
std::list<HostileReference*> AggroList = me->getThreatManager().getThreatList();
std::list<HostileReference*> AggroList = me->getThreatMgr().getThreatList();
std::list<Unit*> UnitsWithMana;
for (std::list<HostileReference*>::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr)
src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+1 -1
View File
@@ -482,7 +482,7 @@ public:
AttackStart(Dragonmaw);
}
HostileReference* ref = me->getThreatManager().getOnlineContainer().getReferenceByTarget(caster);
HostileReference* ref = me->getThreatMgr().getOnlineContainer().getReferenceByTarget(caster);
if (ref)
ref->removeReference();
}
src/server/scripts/Pet/pet_mage.cpp
+2 -2
View File
@@ -91,7 +91,7 @@ public:
// Xinef: Inherit Master's Threat List (not yet implemented)
//owner->CastSpell((Unit*)nullptr, SPELL_MAGE_MASTERS_THREAT_LIST, true);
HostileReference* ref = owner->getHostileRefManager().getFirst();
HostileReference* ref = owner->getHostileRefMgr().getFirst();
while (ref)
{
if (Unit* unit = ref->GetSource()->GetOwner())
@@ -158,7 +158,7 @@ public:
if (selection)
{
me->getThreatManager().resetAllAggro();
me->getThreatMgr().resetAllAggro();
me->AddThreat(selection, 1000000.0f);
if (owner->IsInCombat())
src/server/scripts/Spells/spell_generic.cpp
+3 -3
View File
@@ -1249,7 +1249,7 @@ public:
PreventHitDefaultEffect(effIndex);
if (Unit* target = GetHitUnit())
if (Creature* caster = GetCaster()->ToCreature())
caster->getThreatManager().modifyThreatPercent(target, -25); // Xinef: amount confirmed by onyxia and void reaver notes
caster->getThreatMgr().modifyThreatPercent(target, -25); // Xinef: amount confirmed by onyxia and void reaver notes
}
void Register() override
@@ -1410,7 +1410,7 @@ public:
PreventHitDefaultEffect(effIndex);
if (Unit* target = GetHitUnit())
if (Creature* caster = GetCaster()->ToCreature())
caster->getThreatManager().modifyThreatPercent(target, -100);
caster->getThreatMgr().modifyThreatPercent(target, -100);
}
void Register() override
@@ -5437,7 +5437,7 @@ public:
if (instant_exit)
{
caster->getHostileRefManager().deleteReferences();
caster->getHostileRefMgr().deleteReferences();
}
caster->CombatStop();
}
src/server/scripts/Spells/spell_quest.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "CellImpl.h"
#include "CreatureTextMgr.h"
#include "GridNotifiers.h"
#include "MapManager.h"
#include "MapMgr.h"
#include "ScriptedCreature.h"
#include "ScriptMgr.h"
#include "SpellAuraEffects.h"
src/server/scripts/Spells/spell_warlock.cpp
+1 -1
View File
@@ -857,7 +857,7 @@ public:
Unit* caster = GetCaster();
if (Unit* target = GetHitUnit())
{
if (target->CanHaveThreatList() && target->getThreatManager().getThreat(caster) > 0.0f)
if (target->CanHaveThreatList() && target->getThreatMgr().getThreat(caster) > 0.0f)
caster->CastSpell(target, SPELL_WARLOCK_SOULSHATTER, true);
}
}
src/server/scripts/World/npcs_special.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ EndContentData */
#include "ScriptMgr.h"
#include "SmartAI.h"
#include "SpellAuras.h"
#include "WaypointManager.h"
#include "WaypointMgr.h"
#include "World.h"
enum elderClearwater