pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-08 10:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Utilize GetPlayerState() in mob methods (#3066)

Browse Source 
# Notes
- This method was unused, make use of it.
This commit is contained in:
Alex King 2023-03-16 20:23:34 -04:00 committed by GitHub
parent cc6bcf3295
commit 7961d7afa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/bot.cpp
View File

@ -2989,7 +2989,7 @@ void Bot::AI_Process()
return; return;
} }
if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))) { if (!(GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive))) {
SendAddPlayerState(PlayerState::Aggressive); SendAddPlayerState(PlayerState::Aggressive);
} }
@ -3595,7 +3595,7 @@ void Bot::AI_Process()
GetPet()->SetTarget(nullptr); GetPet()->SetTarget(nullptr);
} }
if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)) { if (GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive)) {
SendRemovePlayerState(PlayerState::Aggressive); SendRemovePlayerState(PlayerState::Aggressive);
} }

4
zone/merc.cpp
View File

@ -1473,7 +1473,7 @@ void Merc::AI_Process() {
return; return;
} }
if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))) if (!(GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive)))
SendAddPlayerState(PlayerState::Aggressive); SendAddPlayerState(PlayerState::Aggressive);
bool atCombatRange = false; bool atCombatRange = false;
@ -1716,7 +1716,7 @@ void Merc::AI_Process() {
confidence_timer.Disable(); confidence_timer.Disable();
_check_confidence = false; _check_confidence = false;
if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)) if (GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive))
SendRemovePlayerState(PlayerState::Aggressive); SendRemovePlayerState(PlayerState::Aggressive);
if(!check_target_timer.Enabled()) if(!check_target_timer.Enabled())

2
zone/mob.cpp
View File

@ -1211,7 +1211,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
ns->spawn.class_ = class_; ns->spawn.class_ = class_;
ns->spawn.gender = gender; ns->spawn.gender = gender;
ns->spawn.level = level; ns->spawn.level = level;
ns->spawn.PlayerState = m_PlayerState; ns->spawn.PlayerState = GetPlayerState();
ns->spawn.deity = deity; ns->spawn.deity = deity;
ns->spawn.animation = 0; ns->spawn.animation = 0;
ns->spawn.findable = findable?1:0; ns->spawn.findable = findable?1:0;

4
zone/mob_ai.cpp
View File

@ -1085,7 +1085,7 @@ void Mob::AI_Process() {
} }
} }
if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))) if (!(GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive)))
SendAddPlayerState(PlayerState::Aggressive); SendAddPlayerState(PlayerState::Aggressive);
// NPCs will forget people after 10 mins of not interacting with them or out of range // NPCs will forget people after 10 mins of not interacting with them or out of range
@ -1381,7 +1381,7 @@ void Mob::AI_Process() {
} }
} }
else { else {
if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)) if (GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive))
SendRemovePlayerState(PlayerState::Aggressive); SendRemovePlayerState(PlayerState::Aggressive);
if (IsPetStop()) // pet stop won't be engaged, so we will always get here and we want the above branch to execute if (IsPetStop()) // pet stop won't be engaged, so we will always get here and we want the above branch to execute