summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-06-12 01:21:47 +0200
committerarchshift <admin@archshift.com>2014-06-17 20:39:21 +0200
commit71b4c4949087860ab9962d6545a0ad2eb9c0ee5a (patch)
tree95de954af7f5b4a921c36172f2fd550cfc0545b6 /src/Entities
parentAdded wither damage type, wither entity effect. (diff)
downloadcuberite-71b4c4949087860ab9962d6545a0ad2eb9c0ee5a.tar
cuberite-71b4c4949087860ab9962d6545a0ad2eb9c0ee5a.tar.gz
cuberite-71b4c4949087860ab9962d6545a0ad2eb9c0ee5a.tar.bz2
cuberite-71b4c4949087860ab9962d6545a0ad2eb9c0ee5a.tar.lz
cuberite-71b4c4949087860ab9962d6545a0ad2eb9c0ee5a.tar.xz
cuberite-71b4c4949087860ab9962d6545a0ad2eb9c0ee5a.tar.zst
cuberite-71b4c4949087860ab9962d6545a0ad2eb9c0ee5a.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.h1
-rw-r--r--src/Entities/SplashPotionEntity.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index b8f1f4c1c..b5d5cc34c 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -158,6 +158,7 @@ public:
bool IsPlayer (void) const { return (m_EntityType == etPlayer); }
bool IsPickup (void) const { return (m_EntityType == etPickup); }
bool IsMob (void) const { return (m_EntityType == etMonster); }
+ bool IsPawn (void) const { return (IsMob() || IsPlayer()); }
bool IsFallingBlock(void) const { return (m_EntityType == etFallingBlock); }
bool IsMinecart (void) const { return (m_EntityType == etMinecart); }
bool IsBoat (void) const { return (m_EntityType == etBoat); }
diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index e8bb0a420..5574ea53c 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -77,7 +77,7 @@ bool cSplashPotionEntity::cSplashPotionCallback::Item(cEntity * a_Entity)
m_EntityEffect.SetDistanceModifier(reduction);
- if (a_Entity->IsMob() || a_Entity->IsPlayer())
+ if (a_Entity->IsPawn())
{
((cPawn *) a_Entity)->AddEntityEffect(m_EntityEffectType, m_EntityEffect);
}