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

Merge remote-tracking branch 'origin/master' into playerimprovements

Browse Source
This commit is contained in:
Tiger Wang
2014-02-03 21:25:42 +00:00
parent 3fc848c95a 2450d0467f
commit a3759c1462
11 changed files with 220 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/Player.cpp
View File

@@ -792,11 +792,11 @@ void cPlayer::SetFlying(bool a_IsFlying)
void cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
{
if (a_TDI.DamageType != dtInVoid)
if ((a_TDI.DamageType != dtInVoid) && (a_TDI.DamageType != dtPlugin))
{
if (IsGameModeCreative())
{
// No damage / health in creative mode if not void damage
// No damage / health in creative mode if not void or plugin damage
return;
}
}