summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-19 22:56:03 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-19 22:56:03 +0200
commitd4f8f0f70e90340f319884d678f7add25adc54a3 (patch)
tree713444f802074ee83e9d344b4e5172ed1a671288
parentAdded forgotten initialisation (diff)
downloadcuberite-d4f8f0f70e90340f319884d678f7add25adc54a3.tar
cuberite-d4f8f0f70e90340f319884d678f7add25adc54a3.tar.gz
cuberite-d4f8f0f70e90340f319884d678f7add25adc54a3.tar.bz2
cuberite-d4f8f0f70e90340f319884d678f7add25adc54a3.tar.lz
cuberite-d4f8f0f70e90340f319884d678f7add25adc54a3.tar.xz
cuberite-d4f8f0f70e90340f319884d678f7add25adc54a3.tar.zst
cuberite-d4f8f0f70e90340f319884d678f7add25adc54a3.zip
Diffstat (limited to '')
-rw-r--r--source/Piston.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/source/Piston.cpp b/source/Piston.cpp
index 0af365b17..d1d2b96a4 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -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);
}
}