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

Fixed a crash when fluid would try to go below the world (y = -1)

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@442 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth 2012-03-31 12:10:17 +00:00
parent 091d958b0c
commit 64f8549604
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/cFluidSimulator.cpp
View File

@ -350,11 +350,13 @@ void cFluidSimulator::Simulate( float a_Dt )
cPickup* Pickup = new cPickup( pos.x * 32 + 16, (pos.y-1) * 32 + 16, pos.z * 32 + 16, cItem( (ENUM_ITEM_ID)DownID, 1, m_World->GetBlockMeta( pos.x, pos.y-1, pos.z ) ) ); cPickup* Pickup = new cPickup( pos.x * 32 + 16, (pos.y-1) * 32 + 16, pos.z * 32 + 16, cItem( (ENUM_ITEM_ID)DownID, 1, m_World->GetBlockMeta( pos.x, pos.y-1, pos.z ) ) );
Pickup->Initialize( m_World ); Pickup->Initialize( m_World );
} }
if( pos.y > 0 )
{
m_World->FastSetBlock( pos.x, pos.y-1, pos.z, m_FluidBlock, 8 ); // falling m_World->FastSetBlock( pos.x, pos.y-1, pos.z, m_FluidBlock, 8 ); // falling
AddBlock( pos.x, pos.y-1, pos.z ); AddBlock( pos.x, pos.y-1, pos.z );
ApplyUniqueToNearest(pos - Vector3i(0, 1, 0)); ApplyUniqueToNearest(pos - Vector3i(0, 1, 0));
} }
}
if(IsSolidBlock(DownID)||( BlockID == m_StationaryFluidBlock)) // Not falling if(IsSolidBlock(DownID)||( BlockID == m_StationaryFluidBlock)) // Not falling
{ {
if( Feed + m_FlowReduction < Meta ) if( Feed + m_FlowReduction < Meta )