flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Two minor changes

Browse Source
This commit is contained in:
Tiger Wang
2014-01-25 19:05:44 +00:00
parent 7468ba0f10
commit 6fa3a0cf70
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Entities/Player.cpp
View File

@@ -463,10 +463,8 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
if (Damage > 0)
{
if (!IsGameModeCreative())
{
TakeDamage(dtFalling, NULL, Damage, Damage, 0);
}
// cPlayer makes sure damage isn't applied in creative, no need to check here
TakeDamage(dtFalling, NULL, Damage, Damage, 0);
// Fall particles
GetWorld()->BroadcastSoundParticleEffect(2006, (int)floor(GetPosX()), (int)GetPosY() - 1, (int)floor(GetPosZ()), Damage /* Used as particle effect speed modifier */);
@@ -790,7 +788,7 @@ void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
{
if (IsGameModeCreative())
{
// No damage / health in creative mode
// No damage / health in creative mode if not void damage
return;
}
}