diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2020-05-15 00:15:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 00:15:35 +0200 |
| commit | 13144a08e496b89b34093ffd3d810d3442df3c44 (patch) | |
| tree | 406d79e17b69560564fdb0972a3c50542a3a96c6 /src/Entities/Entity.cpp | |
| parent | Generate "LuaState_Typedefs.inc" before running clang-tidy (diff) | |
| download | cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.gz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.bz2 cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.lz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.xz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.zst cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 55df8b834..5c444f74a 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -617,7 +617,6 @@ int cEntity::GetRawDamageAgainst(const cEntity & a_Receiver) void cEntity::ApplyArmorDamage(int DamageBlocked) { // cEntities don't necessarily have armor to damage. - return; } @@ -2041,11 +2040,10 @@ bool cEntity::IsA(const char * a_ClassName) const bool cEntity::IsAttachedTo(const cEntity * a_Entity) const { - if ((m_AttachedTo != nullptr) && (a_Entity->GetUniqueID() == m_AttachedTo->GetUniqueID())) - { - return true; - } - return false; + return ( + (m_AttachedTo != nullptr) && + (a_Entity->GetUniqueID() == m_AttachedTo->GetUniqueID()) + ); } |