diff options
| author | madmaxoft <github@xoft.cz> | 2014-06-14 12:06:48 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-06-14 12:06:48 +0200 |
| commit | f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b (patch) | |
| tree | d2f3e35f37821e93d92143db2055bcedeaf57142 /src/Entities/ItemFrame.cpp | |
| parent | Player.h: Moved doxy-comments to Entity.h (diff) | |
| parent | Fixed a repeater issue (diff) | |
| download | cuberite-f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b.tar cuberite-f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b.tar.gz cuberite-f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b.tar.bz2 cuberite-f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b.tar.lz cuberite-f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b.tar.xz cuberite-f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b.tar.zst cuberite-f8f7748a09b936cc888c0c4a1f0ae9e9e444ba5b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Entities/ItemFrame.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp index 9dd909880..7bc7bda8d 100644 --- a/src/Entities/ItemFrame.cpp +++ b/src/Entities/ItemFrame.cpp @@ -55,6 +55,7 @@ void cItemFrame::KilledBy(cEntity * a_Killer) { if (m_Item.IsEmpty()) { + SetHealth(0); super::KilledBy(a_Killer); Destroy(); return; @@ -69,8 +70,9 @@ void cItemFrame::KilledBy(cEntity * a_Killer) } SetHealth(GetMaxHealth()); - m_Item.Clear(); + m_Item.Empty(); m_Rotation = 0; + SetInvulnerableTicks(0); GetWorld()->BroadcastEntityMetadata(*this); } |