diff options
| author | madmaxoft <github@xoft.cz> | 2013-10-24 11:05:43 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-10-24 12:24:39 +0200 |
| commit | d359c5a2fe8a0e5af849916cbd225d31919f1826 (patch) | |
| tree | 952e4a9fe4f39329ada3121a12e1a403b87450d7 /source/Entities/Player.cpp | |
| parent | Merge pull request #286 from tigerw/pickupdelay (diff) | |
| download | cuberite-d359c5a2fe8a0e5af849916cbd225d31919f1826.tar cuberite-d359c5a2fe8a0e5af849916cbd225d31919f1826.tar.gz cuberite-d359c5a2fe8a0e5af849916cbd225d31919f1826.tar.bz2 cuberite-d359c5a2fe8a0e5af849916cbd225d31919f1826.tar.lz cuberite-d359c5a2fe8a0e5af849916cbd225d31919f1826.tar.xz cuberite-d359c5a2fe8a0e5af849916cbd225d31919f1826.tar.zst cuberite-d359c5a2fe8a0e5af849916cbd225d31919f1826.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/Entities/Player.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp index e06281998..f92d42556 100644 --- a/source/Entities/Player.cpp +++ b/source/Entities/Player.cpp @@ -349,11 +349,8 @@ void cPlayer::SetTouchGround(bool a_bTouchGround) void cPlayer::Heal(int a_Health) { - if (m_Health < GetMaxHealth()) - { - m_Health = (short)std::min((int)a_Health + m_Health, (int)GetMaxHealth()); - SendHealth(); - } + super::Heal(a_Health); + SendHealth(); } |