diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-08-01 19:51:43 +0200 |
|---|---|---|
| committer | Lukas Pioch <lukas@zgow.de> | 2017-08-03 15:34:38 +0200 |
| commit | 79eb4c3aed59edce58d2529bf9c6334f7fe6fbad (patch) | |
| tree | 1c572f4c9939968abbcb3ec6b9d6d9630b1f900a /src/Entities/Pawn.h | |
| parent | Remove double includes part 2 (#3890) (diff) | |
| download | cuberite-79eb4c3aed59edce58d2529bf9c6334f7fe6fbad.tar cuberite-79eb4c3aed59edce58d2529bf9c6334f7fe6fbad.tar.gz cuberite-79eb4c3aed59edce58d2529bf9c6334f7fe6fbad.tar.bz2 cuberite-79eb4c3aed59edce58d2529bf9c6334f7fe6fbad.tar.lz cuberite-79eb4c3aed59edce58d2529bf9c6334f7fe6fbad.tar.xz cuberite-79eb4c3aed59edce58d2529bf9c6334f7fe6fbad.tar.zst cuberite-79eb4c3aed59edce58d2529bf9c6334f7fe6fbad.zip | |
Diffstat (limited to 'src/Entities/Pawn.h')
| -rw-r--r-- | src/Entities/Pawn.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h index e6aae4f49..480b523ea 100644 --- a/src/Entities/Pawn.h +++ b/src/Entities/Pawn.h @@ -29,6 +29,7 @@ public: virtual void KilledBy(TakeDamageInfo & a_TDI) override; virtual bool IsFireproof(void) const override; + virtual bool IsInvisible() const override; virtual void HandleAir(void) override; virtual void HandleFalling(void); @@ -66,11 +67,11 @@ public: /** Returns all entity effects */ std::map<cEntityEffect::eType, cEntityEffect *> GetEntityEffects(); - /** Returns the entity effect, if it is currently applied. */ - cEntityEffect *GetEntityEffect(cEntityEffect::eType a_EffectType); + /** Returns the entity effect, if it is currently applied or nullptr if not. */ + cEntityEffect * GetEntityEffect(cEntityEffect::eType a_EffectType); protected: - typedef std::map<cEntityEffect::eType, cEntityEffect *> tEffectMap; + typedef std::map<cEntityEffect::eType, std::unique_ptr<cEntityEffect>> tEffectMap; tEffectMap m_EntityEffects; double m_LastGroundHeight; |