From 4aade202e006738a0baf4c3190cff8ce6b91003c Mon Sep 17 00:00:00 2001
From: LogicParrot <LogicParrot@users.noreply.github.com>
Date: Mon, 1 Feb 2016 22:49:34 +0200
Subject: cMonster::m_Target safety across worlds

---
 src/Entities/Entity.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 0706a1676..b207e79c9 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1514,6 +1514,13 @@ bool cEntity::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d
 
 	SetPosition(a_NewPosition);
 
+	if (this->IsMob())
+	{
+		cMonster * Monster = static_cast<cMonster*>(this);
+		Monster->SetTarget(nullptr);
+		Monster->StopEveryoneFromTargetingMe();
+	}
+
 	// Queue add to new world
 	a_World->AddEntity(this);
 	cWorld * OldWorld = cRoot::Get()->GetWorld(GetWorld()->GetName());  // Required for the hook HOOK_ENTITY_CHANGED_WORLD
-- 
cgit v1.2.3