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

Two minor changes

master
Tiger Wang 2014-01-25 19:05:44 +00:00
parent 7468ba0f10
commit 6fa3a0cf70
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ClientHandle.cpp
View File

@ -620,7 +620,7 @@ void cClientHandle::HandleCommandBlockMessage(const char* a_Data, unsigned int a
} }
else else
{ {
SendChat(Printf("%s[INFO]%s Command blocks are not enabled on this server", cChatColor::Green.c_str(), cChatColor::White.c_str())); SendChat(Printf("%s[INFO]%s Command blocks are not enabled on this server", cChatColor::Yellow.c_str(), cChatColor::White.c_str()));
} }
} }

8
src/Entities/Player.cpp
View File

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