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

Fixed bad water/redstone simulator communication

Browse Source 
* Fixes #713
This commit is contained in:
Tiger Wang 2014-06-27 23:16:37 +01:00
parent b6df30831d
commit 69befa9851
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Simulator/FloodyFluidSimulator.cpp
View File

@ -218,14 +218,20 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
ASSERT(a_NewMeta <= 8); // Invalid meta values ASSERT(a_NewMeta <= 8); // Invalid meta values
ASSERT(a_NewMeta > 0); // Source blocks aren't spread ASSERT(a_NewMeta > 0); // Source blocks aren't spread
BLOCKTYPE BlockType; a_NearChunk = a_NearChunk->GetRelNeighborChunkAdjustCoords(a_RelX, a_RelZ);
NIBBLETYPE BlockMeta; if ((a_NearChunk == NULL) || (!a_NearChunk->IsValid()))
if (!a_NearChunk->UnboundedRelGetBlock(a_RelX, a_RelY, a_RelZ, BlockType, BlockMeta))
{ {
// Chunk not available // Chunk not available
return; return;
} }
const int BlockX = a_NearChunk->GetPosX() * cChunkDef::Width + a_RelX;
const int BlockZ = a_NearChunk->GetPosZ() * cChunkDef::Width + a_RelZ;
BLOCKTYPE BlockType;
NIBBLETYPE BlockMeta;
a_NearChunk->GetBlockTypeMeta(a_RelX, a_RelY, a_RelZ, BlockType, BlockMeta);
if (IsAllowedBlock(BlockType)) if (IsAllowedBlock(BlockType))
{ {
if ((BlockMeta == a_NewMeta) || IsHigherMeta(BlockMeta, a_NewMeta)) if ((BlockMeta == a_NewMeta) || IsHigherMeta(BlockMeta, a_NewMeta))
@ -246,15 +252,9 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
a_RelX, a_RelY, a_RelZ, a_RelX, a_RelY, a_RelZ,
ItemTypeToString(NewBlock).c_str() ItemTypeToString(NewBlock).c_str()
); );
a_NearChunk->UnboundedRelSetBlock(a_RelX, a_RelY, a_RelZ, NewBlock, 0); a_NearChunk->SetBlock(a_RelX, a_RelY, a_RelZ, NewBlock, 0);
int BaseX = a_NearChunk->GetPosX() * cChunkDef::Width; a_NearChunk->BroadcastSoundEffect("random.fizz", BlockX * 8, a_RelY * 8, BlockZ * 8, 0.5f, 1.5f);
int BaseZ = a_NearChunk->GetPosZ() * cChunkDef::Width;
BaseX += a_RelX;
BaseZ += a_RelZ;
a_NearChunk->BroadcastSoundEffect("random.fizz", BaseX * 8, a_RelY * 8, BaseZ * 8, 0.5f, 1.5f);
return; return;
} }
} }
@ -267,15 +267,9 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
FLOG(" Water flowing into lava, turning lava at rel {%d, %d, %d} into %s", FLOG(" Water flowing into lava, turning lava at rel {%d, %d, %d} into %s",
a_RelX, a_RelY, a_RelZ, ItemTypeToString(NewBlock).c_str() a_RelX, a_RelY, a_RelZ, ItemTypeToString(NewBlock).c_str()
); );
a_NearChunk->UnboundedRelSetBlock(a_RelX, a_RelY, a_RelZ, NewBlock, 0); a_NearChunk->SetBlock(a_RelX, a_RelY, a_RelZ, NewBlock, 0);
int BaseX = a_NearChunk->GetPosX() * cChunkDef::Width; a_NearChunk->BroadcastSoundEffect("random.fizz", BlockX * 8, a_RelY * 8, BlockZ * 8, 0.5f, 1.5f);
int BaseZ = a_NearChunk->GetPosZ() * cChunkDef::Width;
BaseX += a_RelX;
BaseZ += a_RelZ;
a_NearChunk->BroadcastSoundEffect("random.fizz", BaseX * 8, a_RelY * 8, BaseZ * 8, 0.5f, 1.5f);
return; return;
} }
} }
@ -303,21 +297,17 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
m_World, m_World,
PluginInterface, PluginInterface,
NULL, NULL,
a_NearChunk->GetPosX() * cChunkDef::Width + a_RelX, BlockX,
a_RelY, a_RelY,
a_NearChunk->GetPosZ() * cChunkDef::Width + a_RelZ BlockZ
); );
} }
} // if (CanWashAway) } // if (CanWashAway)
// Spread: // Spread:
FLOG(" Spreading to {%d, %d, %d} with meta %d", FLOG(" Spreading to {%d, %d, %d} with meta %d", BlockX, a_RelY, BlockZ, a_NewMeta);
a_NearChunk->GetPosX() * cChunkDef::Width + a_RelX, a_NearChunk->SetBlock(a_RelX, a_RelY, a_RelZ, m_FluidBlock, a_NewMeta);
a_RelY, m_World.GetSimulatorManager()->WakeUp(BlockX, a_RelY, BlockZ, a_NearChunk);
a_NearChunk->GetPosZ() * cChunkDef::Width + a_RelZ,
a_NewMeta
);
a_NearChunk->UnboundedRelSetBlock(a_RelX, a_RelY, a_RelZ, m_FluidBlock, a_NewMeta);
HardenBlock(a_NearChunk, a_RelX, a_RelY, a_RelZ, m_FluidBlock, a_NewMeta); HardenBlock(a_NearChunk, a_RelX, a_RelY, a_RelZ, m_FluidBlock, a_NewMeta);
} }
@ -409,13 +399,13 @@ bool cFloodyFluidSimulator::HardenBlock(cChunk * a_Chunk, int a_RelX, int a_RelY
if (a_Meta == 0) if (a_Meta == 0)
{ {
// Source lava block // Source lava block
a_Chunk->UnboundedRelSetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_OBSIDIAN, 0); a_Chunk->SetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_OBSIDIAN, 0);
return true; return true;
} }
// Ignore last lava level // Ignore last lava level
else if (a_Meta <= 4) else if (a_Meta <= 4)
{ {
a_Chunk->UnboundedRelSetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_COBBLESTONE, 0); a_Chunk->SetBlock(a_RelX, a_RelY, a_RelZ, E_BLOCK_COBBLESTONE, 0);
return true; return true;
} }
} }