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

Additional piston corrections

Browse Source 
Reduced delay time of blockset
Fixed invalid blockpush checking
This commit is contained in:
Tiger Wang 2013-08-19 21:56:03 +01:00
parent b51e9fa359
commit d4f8f0f70e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/Piston.cpp
View File

@ -39,16 +39,16 @@ int cPiston::FirstPassthroughBlock(int pistonX, int pistonY, int pistonZ, NIBBLE
NIBBLETYPE currMeta;
AddDir(pistonX, pistonY, pistonZ, pistonmeta, 1);
m_World->GetBlockTypeMeta(pistonX, pistonY, pistonZ, currBlock, currMeta);
if (CanBreakPush(currBlock, currMeta))
{
// This block breaks when pushed, extend up to here
return ret;
}
if (!CanPush(currBlock, currMeta))
{
// This block cannot be pushed at all, the piston can't extend
return -1;
}
if (CanBreakPush(currBlock, currMeta))
{
// This block breaks when pushed, extend up to here
return ret;
}
}
// There is no space for the blocks to move, piston can't extend
return -1;
@ -98,7 +98,7 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
{
AddDir(pistx, pisty, pistz, pistonMeta, -1);
m_World->GetBlockTypeMeta(pistx, pisty, pistz, currBlock, currBlockMeta);
m_World->QueueSetBlock( oldx, oldy, oldz, currBlock, currBlockMeta, 320);
m_World->QueueSetBlock( oldx, oldy, oldz, currBlock, currBlockMeta, 80);
oldx = pistx;
oldy = pisty;
oldz = pistz;
@ -113,7 +113,7 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
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->FastSetBlock( pistx, pisty, pistz, pistonBlock, pistonMeta | 0x8 );
m_World->QueueSetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, pistonMeta | (IsSticky(pistonBlock) ? 8 : 0), 320);
m_World->QueueSetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, pistonMeta | (IsSticky(pistonBlock) ? 8 : 0), 80);
}
@ -133,7 +133,7 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
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->QueueSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8), 320);
m_World->QueueSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8), 80);
// Check the extension:
@ -155,18 +155,18 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
if (CanPull(tempBlock, tempMeta))
{
// Pull the block
m_World->QueueSetBlock(pistx, pisty, pistz, tempBlock, tempMeta, 320);
m_World->QueueSetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0, 320);
m_World->QueueSetBlock(pistx, pisty, pistz, tempBlock, tempMeta, 80);
m_World->QueueSetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0, 80);
}
else
{
// Retract without pulling
m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 320);
m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 80);
}
}
else
{
m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 320);
m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 80);
}
}