summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-07 21:29:09 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-12-07 21:29:09 +0100
commit16db8533e1a9cde333d64dc5a8c8722aa15556cb (patch)
tree310c54f2858f6e4f6dc3ae96bd353e4fcaf6d16e
parentFixed some new 1.7 client crash bugs (diff)
downloadcuberite-16db8533e1a9cde333d64dc5a8c8722aa15556cb.tar
cuberite-16db8533e1a9cde333d64dc5a8c8722aa15556cb.tar.gz
cuberite-16db8533e1a9cde333d64dc5a8c8722aa15556cb.tar.bz2
cuberite-16db8533e1a9cde333d64dc5a8c8722aa15556cb.tar.lz
cuberite-16db8533e1a9cde333d64dc5a8c8722aa15556cb.tar.xz
cuberite-16db8533e1a9cde333d64dc5a8c8722aa15556cb.tar.zst
cuberite-16db8533e1a9cde333d64dc5a8c8722aa15556cb.zip
Diffstat (limited to '')
-rw-r--r--src/Piston.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Piston.cpp b/src/Piston.cpp
index b893af73a..b15e7d95e 100644
--- a/src/Piston.cpp
+++ b/src/Piston.cpp
@@ -15,7 +15,7 @@
/// Number of ticks that the piston extending / retracting waits before setting the block
-const int PISTON_TICK_DELAY = 6;
+const int PISTON_TICK_DELAY = 1;
@@ -142,16 +142,16 @@ void cPiston::RetractPiston(int pistx, int pisty, int pistz)
}
AddDir(pistx, pisty, pistz, pistonMeta, -1);
- 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->SetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8));
+ 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);
AddDir(pistx, pisty, pistz, pistonMeta, 1);
// Retract the extension, pull block if appropriate
if (IsSticky(pistonBlock))
{
int tempx = pistx, tempy = pisty, tempz = pistz;
- AddDir( tempx, tempy, tempz, pistonMeta, 1);
+ AddDir(tempx, tempy, tempz, pistonMeta, 1);
BLOCKTYPE tempBlock;
NIBBLETYPE tempMeta;
m_World->GetBlockTypeMeta(tempx, tempy, tempz, tempBlock, tempMeta);