diff options
| -rw-r--r-- | src/Entities/Entity.cpp | 1 | ||||
| -rw-r--r-- | src/World.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
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); |