diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-23 22:12:48 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-23 22:12:48 +0100 |
| commit | be31652c40af10b0410c76c6bd37b60717c385be (patch) | |
| tree | a84e138bc4d0c1cd4b298dc807f3a196e9a78e3d /source/cEntity.h | |
| parent | Fixed a deadlock by removing clients from all chunks upon their exit, not using the clients chunklists. (diff) | |
| download | cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.gz cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.bz2 cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.lz cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.xz cuberite-be31652c40af10b0410c76c6bd37b60717c385be.tar.zst cuberite-be31652c40af10b0410c76c6bd37b60717c385be.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/cEntity.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/cEntity.h b/source/cEntity.h index 1b26f46be..179af4b17 100644 --- a/source/cEntity.h +++ b/source/cEntity.h @@ -84,6 +84,9 @@ public: //tolua_export int GetChunkY(void) const {return m_ChunkY; }
int GetChunkZ(void) const {return m_ChunkZ; }
+ // Can be used only once - to set the initial world after loading. Not to be used for moving to another world!
+ void SetWorld( cWorld* a_World ) { ASSERT(m_World == NULL); m_World = a_World; }
+
void SetPosX( const double & a_PosX ); //tolua_export
void SetPosY( const double & a_PosY ); //tolua_export
void SetPosZ( const double & a_PosZ ); //tolua_export
@@ -110,7 +113,6 @@ public: //tolua_export protected:
virtual void Destroyed() {} // Called after the entity has been destroyed
- void SetWorld( cWorld* a_World ) { m_World = a_World; }
void MoveToCorrectChunk(bool a_bIgnoreOldChunk = false);
friend class cReferenceManager;
|