summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-18 19:56:04 +0200
committermadmaxoft <github@xoft.cz>2013-08-18 19:56:04 +0200
commit864a0965b1fa5baa8275ebf5e157f9a345b2b386 (patch)
treeb621704706b42106eb655192a2876aa24efe65b1 /source
parentEmergency compilation fix! (diff)
downloadcuberite-864a0965b1fa5baa8275ebf5e157f9a345b2b386.tar
cuberite-864a0965b1fa5baa8275ebf5e157f9a345b2b386.tar.gz
cuberite-864a0965b1fa5baa8275ebf5e157f9a345b2b386.tar.bz2
cuberite-864a0965b1fa5baa8275ebf5e157f9a345b2b386.tar.lz
cuberite-864a0965b1fa5baa8275ebf5e157f9a345b2b386.tar.xz
cuberite-864a0965b1fa5baa8275ebf5e157f9a345b2b386.tar.zst
cuberite-864a0965b1fa5baa8275ebf5e157f9a345b2b386.zip
Diffstat (limited to '')
-rw-r--r--source/Piston.cpp28
1 files changed, 6 insertions, 22 deletions
diff --git a/source/Piston.cpp b/source/Piston.cpp
index 32b5fe9fc..4ea0ce9d1 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -88,7 +88,7 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
cBlockHandler * Handler = BlockHandler(currBlock);
if (Handler->DoesDropOnUnsuitable())
{
- Handler->DropBlock(m_World, NULL, pistx, pisty, pistz); //If block is breakable, drop it
+ Handler->DropBlock(m_World, NULL, pistx, pisty, pistz);
}
}
@@ -111,20 +111,10 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
AddDir(pistx, pisty, pistz, pistonMeta, -1);
// "pist" now at piston body, "ext" at future extension
- if (pistonBlock == E_BLOCK_STICKY_PISTON)
- {
- m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, E_BLOCK_STICKY_PISTON);
- }
- else
- {
- m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, E_BLOCK_PISTON);
- }
-
- char isSticky = (char)(pistonBlock == E_BLOCK_STICKY_PISTON) * 8;
+ 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->SetServerBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, isSticky + pistonMeta);
-
+ m_World->SetServerBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, pistonMeta | (IsSticky(pistonBlock) ? 8 : 0));
}
@@ -142,15 +132,7 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
return;
}
- if (pistonBlock == E_BLOCK_STICKY_PISTON)
- {
- m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), E_BLOCK_STICKY_PISTON);
- }
- else
- {
- m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), E_BLOCK_PISTON);
- }
-
+ 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->SetServerBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8));
@@ -173,11 +155,13 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
m_World->GetBlockTypeMeta(tempx, tempy, tempz, tempBlock, tempMeta);
if (CanPull(tempBlock, tempMeta))
{
+ // Pull the block
m_World->SetServerBlock(pistx, pisty, pistz, tempBlock, tempMeta);
m_World->SetServerBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0);
}
else
{
+ // Retract without pulling
m_World->SetServerBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0);
}
}