2 files changed, 34 insertions, 1 deletions

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 3666b9bee..beb743818 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -84,6 +84,7 @@ cMonster::cMonster(const AString & a_ConfigName, eMonsterType a_MobType, const A
     : super(etMonster, a_Width, a_Height)
     , m_EMState(IDLE)
     , m_EMPersonality(AGGRESSIVE)
+    , m_NearestPlayerIsStale(true)
     , m_PathFinder(a_Width, a_Height)
     , m_PathfinderActivated(false)
     , m_JumpCoolDown(0)
@@ -282,6 +283,7 @@ void cMonster::StopMovingToPosition()
 
 void cMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
+    m_NearestPlayerIsStale = true;
     super::Tick(a_Dt, a_Chunk);
     if (!IsTicking())
     {
@@ -1192,6 +1194,29 @@ void cMonster::GetBreedingItems(cItems & a_Items)
     return GetFollowedItems(a_Items);
 }
 
+
+
+
+
+cPlayer * cMonster::GetNearestPlayer()
+{
+    if (m_NearestPlayerIsStale)
+    {
+        // TODO: Rewrite this to use cWorld's DoWithPlayers()
+        m_NearestPlayer = GetWorld()->FindClosestPlayer(GetPosition(), static_cast<float>(GetSightDistance()));
+        m_NearestPlayerIsStale = false;
+    }
+    if ((m_NearestPlayer != nullptr) && (!m_NearestPlayer->IsTicking()))
+    {
+        m_NearestPlayer = nullptr;
+    }
+    return m_NearestPlayer;
+}
+
+
+
+
+
 std::unique_ptr<cMonster> cMonster::NewMonsterFromType(eMonsterType a_MobType)
 {
     auto & Random = GetRandomProvider();
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 144228fe7..b123791a4 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -232,7 +232,15 @@ public:
     virtual void GetFollowedItems(cItems & a_Items);
     virtual void GetBreedingItems(cItems & a_Items);
 
-protected:
+    cPlayer * GetNearestPlayer();
+
+    protected:
+
+    /** Whether or not m_NearestPlayer is stale. Always true at the beginning of a tick.
+    When true, GetNearestPlayer() actually searches for a player, updates m_NearestPlayer, and sets it to false.
+    otherwise it returns m_NearestPlayer. This means we only perform 1 search per tick. */
+    bool m_NearestPlayerIsStale;
+    cPlayer * m_NearestPlayer;
 
     /** The pathfinder instance handles pathfinding for this monster. */
     cPathFinder m_PathFinder;