diff options
| author | Mattes D <github@xoft.cz> | 2014-07-17 11:23:09 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-07-17 11:23:09 +0200 |
| commit | ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4 (patch) | |
| tree | e2a6e048422755b6a5b04c0fbe3afd0bfbf1c700 /src/Entities/Entity.h | |
| parent | Merge pull request #1193 from mc-server/deathmessages (diff) | |
| parent | Fixed 3 MSVC warnings in SplashPotionEntity. (diff) | |
| download | cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.gz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.bz2 cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.lz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.xz cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.tar.zst cuberite-ec77cf1b06c3008a3c9046a6e0b6a85b0629dba4.zip | |
Diffstat (limited to 'src/Entities/Entity.h')
| -rw-r--r-- | src/Entities/Entity.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 50571ede5..ea44c2722 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); } @@ -315,7 +316,7 @@ public: virtual void Killed(cEntity * a_Victim) {} /// Heals the specified amount of HPs - void Heal(int a_HitPoints); + virtual void Heal(int a_HitPoints); /// Returns the health of this entity int GetHealth(void) const { return m_Health; } |