From 7f7c743204bb7fddfd439bcfa84943ba0fe31755 Mon Sep 17 00:00:00 2001
From: LogicParrot <LogicParrot@users.noreply.github.com>
Date: Wed, 30 Aug 2017 11:29:29 +0300
Subject: Attacker updates

---
 src/Mobs/MobPointer.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/Mobs/MobPointer.cpp')

diff --git a/src/Mobs/MobPointer.cpp b/src/Mobs/MobPointer.cpp
index b755e3cdf..6e3bccee1 100644
--- a/src/Mobs/MobPointer.cpp
+++ b/src/Mobs/MobPointer.cpp
@@ -1,5 +1,8 @@
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
 #include "../Entities/Pawn.h"
 #include "MobPointer.h"
+#include "../World.h"
 
 cMobPointer::cMobPointer(cPawn * a_Pointer) : m_Pointer(a_Pointer)
 {
@@ -62,11 +65,11 @@ void cMobPointer::operator=(cPawn * a_Pointer)
 
 
 
-cPawn * cMobPointer::GetPointer()
+cPawn * cMobPointer::GetPointer(cWorld * a_CurrentWorld)
 {
 	if (m_Pointer != nullptr)
 	{
-		if (!m_Pointer->IsTicking())
+		if (!m_Pointer->IsTicking() || (m_Pointer->GetWorld() != a_CurrentWorld))
 		{
 			m_Pointer = nullptr;
 		}
-- 
cgit v1.2.3