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

Creative players take Plugin damage

This commit is contained in:
Tiger Wang 2014-02-02 12:47:17 +00:00
parent dd325d742d
commit b89419f603
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Entities/Entity.cpp
View File

@ -397,6 +397,7 @@ int cEntity::GetArmorCoverAgainst(const cEntity * a_Attacker, eDamageType a_Dama
case dtPotionOfHarming:
case dtFalling:
case dtLightning:
case dtPlugin:
{
return 0;
}

4
src/Entities/Player.cpp
View File

@ -784,11 +784,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;
}
}