From 7961d7afa855619fe5acb1290fdd8b25def6ad06 Mon Sep 17 00:00:00 2001
From: Alex King <89047260+Kinglykrab@users.noreply.github.com>
Date: Thu, 16 Mar 2023 20:23:34 -0400
Subject: [PATCH] [Cleanup] Utilize GetPlayerState() in mob methods (#3066)

# Notes
- This method was unused, make use of it.
---
 zone/bot.cpp    | 4 ++--
 zone/merc.cpp   | 4 ++--
 zone/mob.cpp    | 2 +-
 zone/mob_ai.cpp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zone/bot.cpp b/zone/bot.cpp
index fb79f333e..c3417f30e 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -2989,7 +2989,7 @@ void Bot::AI_Process()
 			return;
 		}
 
-		if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))) {
+		if (!(GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive))) {
 			SendAddPlayerState(PlayerState::Aggressive);
 		}
 
@@ -3595,7 +3595,7 @@ void Bot::AI_Process()
 			GetPet()->SetTarget(nullptr);
 		}
 
-		if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)) {
+		if (GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive)) {
 			SendRemovePlayerState(PlayerState::Aggressive);
 		}
 
diff --git a/zone/merc.cpp b/zone/merc.cpp
index 47e1794cd..028416596 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -1473,7 +1473,7 @@ void Merc::AI_Process() {
 			return;
 		}
 
-		if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)))
+		if (!(GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive)))
 			SendAddPlayerState(PlayerState::Aggressive);
 
 		bool atCombatRange = false;
@@ -1716,7 +1716,7 @@ void Merc::AI_Process() {
 		confidence_timer.Disable();
 		_check_confidence = false;
 
-		if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))
+		if (GetPlayerState() & static_cast<uint32>(PlayerState::Aggressive))
 			SendRemovePlayerState(PlayerState::Aggressive);
 
 		if(!check_target_timer.Enabled())
diff --git a/zone/mob.cpp b/zone/mob.cpp
index dca143cab..cd8d8650f 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -1211,7 +1211,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
 	ns->spawn.class_	= class_;
 	ns->spawn.gender	= gender;
 	ns->spawn.level		= level;
-	ns->spawn.PlayerState	= m_PlayerState;
+	ns->spawn.PlayerState	= GetPlayerState();
 	ns->spawn.deity		= deity;
 	ns->spawn.animation	= 0;
 	ns->spawn.findable	= findable?1:0;
diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp
index 2041fe9e6..eb8ee55b6 100644
--- a/zone/mob_ai.cpp
+++ b/zone/mob_ai.cpp
@@ -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);
 
 		// 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 {
-		if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))
+		if (GetPlayerState() & static_cast<uint32>(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