diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-19 13:49:01 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-19 13:49:01 +0200 |
| commit | 34fa53ca3a78fc32003c85256eeb623f96bc663f (patch) | |
| tree | 56f0e623b3275da0b55d76bc775ec29f5dbfdf1a /source/Chunk.cpp | |
| parent | WebAdmin: The plugin list is sorted alphabetically and if they are enabled or disabled. (diff) | |
| download | cuberite-34fa53ca3a78fc32003c85256eeb623f96bc663f.tar cuberite-34fa53ca3a78fc32003c85256eeb623f96bc663f.tar.gz cuberite-34fa53ca3a78fc32003c85256eeb623f96bc663f.tar.bz2 cuberite-34fa53ca3a78fc32003c85256eeb623f96bc663f.tar.lz cuberite-34fa53ca3a78fc32003c85256eeb623f96bc663f.tar.xz cuberite-34fa53ca3a78fc32003c85256eeb623f96bc663f.tar.zst cuberite-34fa53ca3a78fc32003c85256eeb623f96bc663f.zip | |
Diffstat (limited to 'source/Chunk.cpp')
| -rw-r--r-- | source/Chunk.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/Chunk.cpp b/source/Chunk.cpp index 72313fa08..264fe1170 100644 --- a/source/Chunk.cpp +++ b/source/Chunk.cpp @@ -500,7 +500,7 @@ void cChunk::Tick(float a_Dt) void cChunk::MoveEntityToNewChunk(cEntity * a_Entity) { - cChunk * Neighbor = GetNeighborChunk((int)a_Entity->GetPosX(), (int)a_Entity->GetPosZ()); + cChunk * Neighbor = GetNeighborChunk(a_Entity->GetChunkX() * cChunkDef::Width, a_Entity->GetChunkZ() * cChunkDef::Width); if (Neighbor == NULL) { Neighbor = m_ChunkMap->GetChunkNoLoad(a_Entity->GetChunkX(), ZERO_CHUNK_Y, a_Entity->GetChunkZ()); @@ -512,6 +512,8 @@ void cChunk::MoveEntityToNewChunk(cEntity * a_Entity) } } + ASSERT(Neighbor != this); // Moving into the same chunk? wtf? + Neighbor->AddEntity(a_Entity); class cMover : |