summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-04-07 23:04:23 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-04-07 23:04:23 +0200
commit905cc96dff382a6dfb996fcae07466b7b7f565ee (patch)
tree01854f75a196a33d0b2b10d29b57fed616fc88d3
parentAdded SQLite and LuaSQLite, Lua plugins can now use SQLite. (diff)
downloadcuberite-905cc96dff382a6dfb996fcae07466b7b7f565ee.tar
cuberite-905cc96dff382a6dfb996fcae07466b7b7f565ee.tar.gz
cuberite-905cc96dff382a6dfb996fcae07466b7b7f565ee.tar.bz2
cuberite-905cc96dff382a6dfb996fcae07466b7b7f565ee.tar.lz
cuberite-905cc96dff382a6dfb996fcae07466b7b7f565ee.tar.xz
cuberite-905cc96dff382a6dfb996fcae07466b7b7f565ee.tar.zst
cuberite-905cc96dff382a6dfb996fcae07466b7b7f565ee.zip
-rw-r--r--source/Entity.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/Entity.cpp b/source/Entity.cpp
index c6df88020..d2404373b 100644
--- a/source/Entity.cpp
+++ b/source/Entity.cpp
@@ -36,7 +36,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z)
, m_bDirtyOrientation(true)
, m_bDirtyPosition(true)
, m_bDirtySpeed(true)
- , m_bDestroyed(false)
+ , m_bDestroyed(true)
, m_LastPosX( 0.0 )
, m_LastPosY( 0.0 )
, m_LastPosZ( 0.0 )
@@ -45,7 +45,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z)
, m_TimeLastSpeedPacket(0)
, m_EntityType(a_EntityType)
, m_World(NULL)
- , m_bRemovedFromChunk(false)
+ , m_bRemovedFromChunk(true)
, m_FireDamageInterval(0.f)
, m_BurnPeriod(0.f)
{
@@ -118,6 +118,9 @@ const char * cEntity::GetParentClass(void) const
void cEntity::Initialize(cWorld * a_World)
{
+ m_bDestroyed = false;
+ m_bRemovedFromChunk = false;
+
m_World = a_World;
m_World->AddEntity(this);