summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-02 13:47:17 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-02 13:47:17 +0100
commitb89419f603126b9c8e01c607912b2976ba66ffda (patch)
tree20df68bbf68a91fdb3171470ae45160b4330cbbe /src
parentAgain improved LogReplaceLine (diff)
downloadcuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar
cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.gz
cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.bz2
cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.lz
cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.xz
cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.tar.zst
cuberite-b89419f603126b9c8e01c607912b2976ba66ffda.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/Entity.cpp3
-rw-r--r--src/Entities/Player.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index e22f689d9..08780ca8b 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -397,6 +397,7 @@ int cEntity::GetArmorCoverAgainst(const cEntity * a_Attacker, eDamageType a_Dama
case dtPotionOfHarming:
case dtFalling:
case dtLightning:
+ case dtPlugin:
{
return 0;
}
@@ -473,7 +474,7 @@ void cEntity::KilledBy(cEntity * a_Killer)
return;
}
- // Drop loot:
+ // Drop loot:
cItems Drops;
GetDrops(Drops, a_Killer);
m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY(), GetPosZ());
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 82e31ae65..ca0f0e770 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -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;
}
}