summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2013-11-20 20:55:03 +0100
committerMattes D <github@xoft.cz>2013-11-20 20:55:03 +0100
commit0bad762352ecdde908cff73db9b4fb509cf24486 (patch)
tree6845cc8a3d840957fb39b49d79963da2cb0d7d5c
parentMerge pull request #350 from mc-server/arrows (diff)
parentFixed piston sound effect (when unable to extend) (diff)
downloadcuberite-0bad762352ecdde908cff73db9b4fb509cf24486.tar
cuberite-0bad762352ecdde908cff73db9b4fb509cf24486.tar.gz
cuberite-0bad762352ecdde908cff73db9b4fb509cf24486.tar.bz2
cuberite-0bad762352ecdde908cff73db9b4fb509cf24486.tar.lz
cuberite-0bad762352ecdde908cff73db9b4fb509cf24486.tar.xz
cuberite-0bad762352ecdde908cff73db9b4fb509cf24486.tar.zst
cuberite-0bad762352ecdde908cff73db9b4fb509cf24486.zip
-rw-r--r--source/Piston.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/Piston.cpp b/source/Piston.cpp
index ed175d3e3..048cc355d 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -71,9 +71,6 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
return;
}
- 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);
-
int dist = FirstPassthroughBlock(pistx, pisty, pistz, pistonMeta);
if (dist < 0)
{
@@ -81,6 +78,9 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz)
return;
}
+ 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);
+
// Drop the breakable block in the line, if appropriate:
AddDir(pistx, pisty, pistz, pistonMeta, dist + 1); // "pist" now at the breakable / empty block
BLOCKTYPE currBlock;