summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-22 01:21:39 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-22 01:21:39 +0200
commite709652257da1ba06a6642b4978365b14bc11a22 (patch)
tree3e0d656b49c462ee6bd6d58ca54b5b53e1641bb3
parentMerge branch 'master' into portals (diff)
downloadcuberite-e709652257da1ba06a6642b4978365b14bc11a22.tar
cuberite-e709652257da1ba06a6642b4978365b14bc11a22.tar.gz
cuberite-e709652257da1ba06a6642b4978365b14bc11a22.tar.bz2
cuberite-e709652257da1ba06a6642b4978365b14bc11a22.tar.lz
cuberite-e709652257da1ba06a6642b4978365b14bc11a22.tar.xz
cuberite-e709652257da1ba06a6642b4978365b14bc11a22.tar.zst
cuberite-e709652257da1ba06a6642b4978365b14bc11a22.zip
-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 fadd12135..d4edc9144 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -37,6 +37,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
, m_Gravity(-9.81f)
, m_LastPos(a_X, a_Y, a_Z)
, m_IsInitialized(false)
+ , m_IsTravellingThroughPortal(false)
, m_EntityType(a_EntityType)
, m_World(NULL)
, m_IsFireproof(false)
@@ -57,7 +58,6 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
, m_Width(a_Width)
, m_Height(a_Height)
, m_InvulnerableTicks(0)
- , m_IsTravellingThroughPortal(false)
{
cCSLock Lock(m_CSCount);
m_EntityCount++;