summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2021-04-06 13:26:43 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2021-04-12 23:35:07 +0200
commit1394fc8eb5c8c0ac49bb64ce1871a80470f058c3 (patch)
treec2f244154cb90f814e448da9ab9cb09b430d6b1e /src/Entities/Entity.cpp
parentFix block break particles (diff)
downloadcuberite-1394fc8eb5c8c0ac49bb64ce1871a80470f058c3.tar
cuberite-1394fc8eb5c8c0ac49bb64ce1871a80470f058c3.tar.gz
cuberite-1394fc8eb5c8c0ac49bb64ce1871a80470f058c3.tar.bz2
cuberite-1394fc8eb5c8c0ac49bb64ce1871a80470f058c3.tar.lz
cuberite-1394fc8eb5c8c0ac49bb64ce1871a80470f058c3.tar.xz
cuberite-1394fc8eb5c8c0ac49bb64ce1871a80470f058c3.tar.zst
cuberite-1394fc8eb5c8c0ac49bb64ce1871a80470f058c3.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 9fc3f80cf..6c777aca4 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -122,7 +122,7 @@ bool cEntity::Initialize(OwnedEntity a_Self, cWorld & a_EntityWorld)
*/
- ASSERT(m_World == nullptr);
+ ASSERT(a_Self->IsPlayer() || (m_World == nullptr)); // Players' worlds are loaded from disk.
ASSERT(GetParentChunk() == nullptr);
SetWorld(&a_EntityWorld);
a_EntityWorld.AddEntity(std::move(a_Self));