diff options
| author | Mattes D <github@xoft.cz> | 2014-07-19 13:31:35 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-07-19 13:31:35 +0200 |
| commit | c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc (patch) | |
| tree | a8de103269fb7ef98a726e51bf8fcdfd17702ab9 /src/Entities/Entity.cpp | |
| parent | Merge pull request #1224 from mc-server/fixes-potions (diff) | |
| parent | World.cpp: fixed not all enum fields being used in m_Dimension switch (diff) | |
| download | cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.gz cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.bz2 cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.lz cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.xz cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.tar.zst cuberite-c2aa7d78bfe45e6ca363cb831d5cd605bf1779fc.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 61b28ec70..f9331ede8 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -327,10 +327,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI) // TODO: Apply damage to armor - if (m_Health < 0) - { - m_Health = 0; - } + m_Health = std::max(m_Health, 0); if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL)) // Knockback for only players and mobs { |