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

Digging leaves with shears now drops leaves

Browse Source 
Falling Sand now notifies water around
Implemented Function to get the relative chunk position in the total position (cChunk::PositionToWorldPosition)
Pistons don´t drop water and lava items anymore when stopping water/lava
implemented Getter for lava and water simulator
IsBlockWater and IsBlockLava function in Defines.h




git-svn-id: http://mc-server.googlecode.com/svn/trunk@97 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
lapayo94@gmail.com
2011-12-22 21:36:24 +00:00
parent e54373160b
commit 24efa6f864
8 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/cChunk.cpp
View File

@@ -5,8 +5,12 @@
#include <sys/stat.h> // for mkdir
#include <sys/types.h>
#endif
#include "cChunk.h"
#include "cWorld.h"
#include "cWaterSimulator.h"
#include "cLavaSimulator.h"
#include "cClientHandle.h"
#include "cServer.h"
#include "zlib.h"
@@ -249,7 +253,13 @@ void cChunk::Tick(float a_Dt)
{
if( GetBlock( X, Y-1, Z ) == E_BLOCK_AIR )
{
SetBlock( X, Y, Z, 0, 0 );
SetBlock( X, Y, Z, E_BLOCK_AIR, 0 );
int wX, wY, wZ;
PositionToWorldPosition(X, Y, Z, wX, wY, wZ);
m_World->GetWaterSimulator()->WakeUp( wX, wY, wZ );
m_World->GetLavaSimulator()->WakeUp( wX, wY, wZ );
if (isRedstone) {
cRedstone Redstone(m_World);
Redstone.ChangeRedstone( (X+m_PosX*16), (Y+m_PosY*16), (Z+m_PosZ*16), false );
@@ -291,7 +301,7 @@ void cChunk::Tick(float a_Dt)
AddDirection( XX, YY, ZZ, Dir, true );
if( m_World->GetBlock( XX, YY, ZZ ) == E_BLOCK_AIR )
{
SetBlock( X, Y, Z, 0, 0 );
SetBlock( X, Y, Z, E_BLOCK_AIR, 0 );
cPickup* Pickup = new cPickup( (X+m_PosX*16) * 32 + 16, (Y+m_PosY*128) * 32 + 16, (Z+m_PosZ*16) * 32 + 16, cItem( (ENUM_ITEM_ID)BlockID, 1 ) );
Pickup->Initialize( m_World );
}
@@ -305,10 +315,19 @@ void cChunk::Tick(float a_Dt)
case E_BLOCK_SAND:
{
char BottomBlock = GetBlock( X, Y-1, Z );
if( BottomBlock == E_BLOCK_AIR || BottomBlock == E_BLOCK_WATER || BottomBlock == E_BLOCK_STATIONARY_WATER || BottomBlock == E_BLOCK_LAVA || BottomBlock == E_BLOCK_STATIONARY_LAVA )
if( BottomBlock == E_BLOCK_AIR || IsBlockWater(BottomBlock) || IsBlockLava(BottomBlock) )
{
SetBlock( X, Y, Z, 0, 0 );
SetBlock( X, Y, Z, E_BLOCK_AIR, 0 );
SetBlock( X, Y-1, Z, BlockID, 0 );
int wX, wY, wZ;
PositionToWorldPosition(X, Y, Z, wX, wY, wZ);
m_World->GetWaterSimulator()->WakeUp( wX, wY, wZ );
m_World->GetLavaSimulator()->WakeUp( wX, wY, wZ );
m_World->GetWaterSimulator()->WakeUp( wX, wY - 1, wZ );
m_World->GetLavaSimulator()->WakeUp( wX, wY - 1, wZ );
}
}
break;
@@ -1448,3 +1467,11 @@ void cChunk::RemoveTickBlockEntity( cFurnaceEntity* a_Entity )
{
m_pState->m_TickBlockEntities.remove( a_Entity );
}
void cChunk::PositionToWorldPosition(int a_ChunkX, int a_ChunkY, int a_ChunkZ, int & a_X, int & a_Y, int & a_Z)
{
a_Y = a_ChunkY;
a_X = m_PosX * 16 + a_ChunkX;
a_Z = m_PosZ * 16 + a_ChunkZ;
}