ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed fall damage again 

Added sound effects to pistons

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1074 0a769ca7-a7f5-676a-18bf-c427514a06d6
master
luksor111@gmail.com 2012-12-15 13:27:01 +00:00
parent 310c1076a7
commit 9a839a3a98
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Piston.cpp
View File

@ -83,6 +83,7 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz )
oldz = pistz;
}
m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, E_BLOCK_PISTON);
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 );
int extx = pistx;
@ -108,6 +109,7 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
return;
}
m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), E_BLOCK_PISTON);
m_World->BroadcastSoundEffect("tile.piston.in", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f);
m_World->FastSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8));
AddDir(pistx, pisty, pistz, pistonMeta & 7, 1)

2
source/Player.cpp
View File

@ -291,7 +291,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
if (m_bTouchGround)
{
float Dist = (float)(m_LastGroundHeight - m_Pos.y);
float Dist = (float)(m_LastGroundHeight - floor(m_Pos.y));
int Damage = (int)(Dist - 3.f);
if(m_LastJumpHeight > m_LastGroundHeight) Damage++;
m_LastJumpHeight = (float)m_Pos.y;