summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-01-24 09:57:12 +0100
committermadmaxoft <github@xoft.cz>2014-01-24 09:57:12 +0100
commitb02940209d64e4239ac6c0e7c8cb4f1d8280b7aa (patch)
treeb01d4dd08322ad26fbd9014d31de0efcf0cdbf76 /src/Entities
parentAPIDump: Fixed indent after merge. (diff)
downloadcuberite-b02940209d64e4239ac6c0e7c8cb4f1d8280b7aa.tar
cuberite-b02940209d64e4239ac6c0e7c8cb4f1d8280b7aa.tar.gz
cuberite-b02940209d64e4239ac6c0e7c8cb4f1d8280b7aa.tar.bz2
cuberite-b02940209d64e4239ac6c0e7c8cb4f1d8280b7aa.tar.lz
cuberite-b02940209d64e4239ac6c0e7c8cb4f1d8280b7aa.tar.xz
cuberite-b02940209d64e4239ac6c0e7c8cb4f1d8280b7aa.tar.zst
cuberite-b02940209d64e4239ac6c0e7c8cb4f1d8280b7aa.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 565c78dfd..09fb7052d 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -73,7 +73,8 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
cEntity::~cEntity()
{
- ASSERT(!m_World->HasEntity(m_UniqueID)); // Before deleting, the entity needs to have been removed from the world
+ // Before deleting, the entity needs to have been removed from the world, if ever added
+ ASSERT((m_World == NULL) || !m_World->HasEntity(m_UniqueID));
/*
// DEBUG: