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

Simulators are woken up upon chunk load

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1248 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-03-03 15:33:55 +00:00
parent 4e8fd2c084
commit 55326ee2a7
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/Chunk.cpp
View File

@ -308,6 +308,9 @@ void cChunk::SetAllData(
// Create block entities that the loader didn't load; fill them with defaults
CreateBlockEntities();
// Wake up all simulators for their respective blocks:
WakeUpSimulators();
m_HasLoadFailed = false;
}
@ -1052,6 +1055,42 @@ void cChunk::CreateBlockEntities(void)
void cChunk::WakeUpSimulators(void)
{
cSimulator * WaterSimulator = m_World->GetWaterSimulator();
cSimulator * LavaSimulator = m_World->GetLavaSimulator();
int BaseX = m_PosX * cChunkDef::Width;
int BaseZ = m_PosZ * cChunkDef::Width;
for (int x = 0; x < Width; x++)
{
int BlockX = x + BaseX;
for (int z = 0; z < Width; z++)
{
int BlockZ = z + BaseZ;
for (int y = GetHeight(x, z); y >= 0; y--)
{
switch (cChunkDef::GetBlock(m_BlockTypes, x, y, z))
{
case E_BLOCK_WATER:
{
WaterSimulator->AddBlock(BlockX, y, BlockZ, this);
break;
}
case E_BLOCK_LAVA:
{
LavaSimulator->AddBlock(BlockX, y, BlockZ, this);
break;
}
} // switch (BlockType)
} // for y
} // for z
} // for x
}
void cChunk::CalculateHeightmap()
{
for (int x = 0; x < Width; x++)

4
source/Chunk.h
View File

@ -331,8 +331,12 @@ private:
void SpreadLightOfBlock(NIBBLETYPE * a_LightBuffer, int a_X, int a_Y, int a_Z, char a_Falloff);
/// Creates a block entity for each block that needs a block entity and doesn't have one in the list
void CreateBlockEntities(void);
/// Wakes up each simulator for its specific blocks; through all the blocks in the chunk
void WakeUpSimulators(void);
// Makes a copy of the list
cClientHandleList GetAllClients(void) const {return m_LoadedByClient; }

2
source/Simulator/Simulator.h
View File

@ -33,6 +33,8 @@ public:
virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) = 0;
protected:
friend class cChunk; // Calls AddBlock() in its WakeUpSimulators() function, to speed things up
/// Called to simulate a new block
virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) = 0;