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

Merge branch 'tigerw-master', fixed pistons pushing extended sticky pistons.

Browse Source
This commit is contained in:
madmaxoft 2013-08-19 23:43:08 +02:00
commit 2e5de0c13d
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Chunk.h
View File

@ -330,7 +330,7 @@ private:
Int64 m_Tick; Int64 m_Tick;
sSetBlockQueueItem(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Int64 a_Tick) : sSetBlockQueueItem(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Int64 a_Tick) :
m_RelX(a_RelX), m_RelY(a_RelY), m_RelZ(a_RelZ) m_RelX(a_RelX), m_RelY(a_RelY), m_RelZ(a_RelZ), m_BlockType(a_BlockType), m_BlockMeta(a_BlockMeta), m_Tick(a_Tick)
{ {
} }
} ; } ;

22
source/Piston.cpp
View File

@ -20,6 +20,13 @@ extern bool g_BlockPistonBreakable[];
/// Number of ticks that the piston extending / retracting waits before setting the block
const int PISTON_TICK_DELAY = 5;
cPiston::cPiston(cWorld * a_World) cPiston::cPiston(cWorld * a_World)
: m_World(a_World) : m_World(a_World)
{ {
@ -98,7 +105,7 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
{ {
AddDir(pistx, pisty, pistz, pistonMeta, -1); AddDir(pistx, pisty, pistz, pistonMeta, -1);
m_World->GetBlockTypeMeta(pistx, pisty, pistz, currBlock, currBlockMeta); m_World->GetBlockTypeMeta(pistx, pisty, pistz, currBlock, currBlockMeta);
m_World->SetBlock( oldx, oldy, oldz, currBlock, currBlockMeta); m_World->QueueSetBlock( oldx, oldy, oldz, currBlock, currBlockMeta, PISTON_TICK_DELAY);
oldx = pistx; oldx = pistx;
oldy = pisty; oldy = pisty;
oldz = pistz; oldz = pistz;
@ -113,7 +120,7 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, pistonBlock); m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, pistonBlock);
m_World->BroadcastSoundEffect("tile.piston.out", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f); m_World->BroadcastSoundEffect("tile.piston.out", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f);
m_World->FastSetBlock( pistx, pisty, pistz, pistonBlock, pistonMeta | 0x8 ); m_World->FastSetBlock( pistx, pisty, pistz, pistonBlock, pistonMeta | 0x8 );
m_World->SetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, pistonMeta | (IsSticky(pistonBlock) ? 8 : 0)); m_World->QueueSetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, pistonMeta | (IsSticky(pistonBlock) ? 8 : 0), PISTON_TICK_DELAY);
} }
@ -133,7 +140,7 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), pistonBlock); m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), pistonBlock);
m_World->BroadcastSoundEffect("tile.piston.in", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f); m_World->BroadcastSoundEffect("tile.piston.in", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f);
m_World->SetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8)); m_World->QueueSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8), PISTON_TICK_DELAY);
// Check the extension: // Check the extension:
@ -155,18 +162,18 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
if (CanPull(tempBlock, tempMeta)) if (CanPull(tempBlock, tempMeta))
{ {
// Pull the block // Pull the block
m_World->SetBlock(pistx, pisty, pistz, tempBlock, tempMeta); m_World->QueueSetBlock(pistx, pisty, pistz, tempBlock, tempMeta, PISTON_TICK_DELAY);
m_World->SetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0); m_World->QueueSetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0, PISTON_TICK_DELAY);
} }
else else
{ {
// Retract without pulling // Retract without pulling
m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0); m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, PISTON_TICK_DELAY);
} }
} }
else else
{ {
m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0); m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, PISTON_TICK_DELAY);
} }
} }
@ -228,6 +235,7 @@ bool cPiston::CanPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
{ {
return false; return false;
} }
case E_BLOCK_STICKY_PISTON:
case E_BLOCK_PISTON: case E_BLOCK_PISTON:
{ {
// A piston can only be pushed if retracted: // A piston can only be pushed if retracted: