summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-19 20:44:22 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-19 20:44:22 +0200
commitc11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50 (patch)
tree5a83b29bd3f302d6ba7bfbdc49683f25a9a92dfa
parentFixed uninitialised thingummies (diff)
downloadcuberite-c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50.tar
cuberite-c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50.tar.gz
cuberite-c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50.tar.bz2
cuberite-c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50.tar.lz
cuberite-c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50.tar.xz
cuberite-c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50.tar.zst
cuberite-c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50.zip
-rw-r--r--source/Piston.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/Piston.cpp b/source/Piston.cpp
index d6ea01803..0af365b17 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -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->SetBlock( oldx, oldy, oldz, currBlock, currBlockMeta);
+ m_World->QueueSetBlock( oldx, oldy, oldz, currBlock, currBlockMeta, 320);
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->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), 320);
}
@@ -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->SetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8));
+ m_World->QueueSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8), 320);
// 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->SetBlock(pistx, pisty, pistz, tempBlock, tempMeta);
- m_World->SetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0);
+ m_World->QueueSetBlock(pistx, pisty, pistz, tempBlock, tempMeta, 320);
+ m_World->QueueSetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0, 320);
}
else
{
// Retract without pulling
- m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0);
+ m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 320);
}
}
else
{
- m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0);
+ m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 320);
}
}