flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1154 from mc-server/trappedchests

Browse Source 
Implemented trapped chests & others
This commit is contained in:
Tiger Wang
2014-07-12 23:24:32 +01:00
parent 945dfe75d7 e2e0f52ecb
commit 5f72cdac38
26 changed files with 387 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/World.cpp
View File

@@ -389,8 +389,8 @@ void cWorld::InitializeSpawn(void)
IniFile.WriteFile(m_IniFileName);
}
int ChunkX = 0, ChunkY = 0, ChunkZ = 0;
BlockToChunk((int)m_SpawnX, (int)m_SpawnY, (int)m_SpawnZ, ChunkX, ChunkY, ChunkZ);
int ChunkX = 0, ChunkZ = 0;
cChunkDef::BlockToChunk((int)m_SpawnX, (int)m_SpawnZ, ChunkX, ChunkZ);
// For the debugging builds, don't make the server build too much world upon start:
#if defined(_DEBUG) || defined(ANDROID_NDK)
@@ -2182,9 +2182,18 @@ void cWorld::SendBlockEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cClientHa
void cWorld::MarkChunkDirty (int a_ChunkX, int a_ChunkZ)
void cWorld::MarkRedstoneDirty(int a_ChunkX, int a_ChunkZ)
{
m_ChunkMap->MarkChunkDirty (a_ChunkX, a_ChunkZ);
m_ChunkMap->MarkRedstoneDirty(a_ChunkX, a_ChunkZ);
}
void cWorld::MarkChunkDirty(int a_ChunkX, int a_ChunkZ, bool a_MarkRedstoneDirty)
{
m_ChunkMap->MarkChunkDirty(a_ChunkX, a_ChunkZ, a_MarkRedstoneDirty);
}