From 5f2c572f9a68a43a0e9aed98fc08fdeab5a50ddf Mon Sep 17 00:00:00 2001
From: mathiascode <mail@mathias.is>
Date: Sun, 3 May 2020 01:37:35 +0300
Subject: Set entity world early

---
 src/Entities/Entity.cpp | 1 +
 src/World.cpp           | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index e7b1c469f..0f1266445 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -154,6 +154,7 @@ bool cEntity::Initialize(OwnedEntity a_Self, cWorld & a_EntityWorld)
 
 	ASSERT(m_World == nullptr);
 	ASSERT(GetParentChunk() == nullptr);
+	SetWorld(&a_EntityWorld);
 	a_EntityWorld.AddEntity(std::move(a_Self));
 
 	return true;
diff --git a/src/World.cpp b/src/World.cpp
index c0838e1bf..2fde36259 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1024,7 +1024,6 @@ void cWorld::Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_La
 	}
 	for (auto & Entity : EntitiesToAdd)
 	{
-		Entity->SetWorld(this);
 		auto EntityPtr = Entity.get();
 		m_ChunkMap->AddEntity(std::move(Entity));
 		EntityPtr->OnAddToWorld(*this);
-- 
cgit v1.2.3