summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2017-06-15 17:06:50 +0200
committerworktycho <work.tycho@gmail.com>2017-06-15 17:06:50 +0200
commit885d80ccdb97c984abe85eaeaecf1aedc3e36d25 (patch)
treea601ae53a96c7aae83900571af1d38bc0cd1b33a /src/Entities/Entity.h
parentReplace evdns with getaddrinfo and getnameinfo (#3766) (diff)
downloadcuberite-885d80ccdb97c984abe85eaeaecf1aedc3e36d25.tar
cuberite-885d80ccdb97c984abe85eaeaecf1aedc3e36d25.tar.gz
cuberite-885d80ccdb97c984abe85eaeaecf1aedc3e36d25.tar.bz2
cuberite-885d80ccdb97c984abe85eaeaecf1aedc3e36d25.tar.lz
cuberite-885d80ccdb97c984abe85eaeaecf1aedc3e36d25.tar.xz
cuberite-885d80ccdb97c984abe85eaeaecf1aedc3e36d25.tar.zst
cuberite-885d80ccdb97c984abe85eaeaecf1aedc3e36d25.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index b7778e797..4310b1567 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -32,7 +32,12 @@
#define POSZ_TOINT FloorC(GetPosZ())
#define POS_TOINT GetPosition().Floor()
-#define GET_AND_VERIFY_CURRENT_CHUNK(ChunkVarName, X, Z) cChunk * ChunkVarName = a_Chunk.GetNeighborChunk(X, Z); if ((ChunkVarName == nullptr) || !ChunkVarName->IsValid()) { return; }
+#define GET_AND_VERIFY_CURRENT_CHUNK(ChunkVarName, X, Z) \
+ cChunk * ChunkVarName = a_Chunk.GetNeighborChunk(X, Z); \
+ if ((ChunkVarName == nullptr) || !ChunkVarName->IsValid()) \
+ { \
+ return; \
+ }
@@ -518,9 +523,6 @@ protected:
bool m_ShouldPreventTeleportation;
};
- static cCriticalSection m_CSCount;
- static UInt32 m_EntityCount;
-
/** Measured in meters / second (m / s) */
Vector3d m_Speed;