diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-11 20:34:41 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-12 10:47:59 +0100 |
| commit | 359e772dee0ef4595c8ad982f17e13725f255219 (patch) | |
| tree | 4c784bee23613af41e0dda909b90c1c2fd7140a6 /src/Entities/FireChargeEntity.cpp | |
| parent | Merge pull request #2848 from Nakkar/master (diff) | |
| download | cuberite-359e772dee0ef4595c8ad982f17e13725f255219.tar cuberite-359e772dee0ef4595c8ad982f17e13725f255219.tar.gz cuberite-359e772dee0ef4595c8ad982f17e13725f255219.tar.bz2 cuberite-359e772dee0ef4595c8ad982f17e13725f255219.tar.lz cuberite-359e772dee0ef4595c8ad982f17e13725f255219.tar.xz cuberite-359e772dee0ef4595c8ad982f17e13725f255219.tar.zst cuberite-359e772dee0ef4595c8ad982f17e13725f255219.zip | |
Diffstat (limited to 'src/Entities/FireChargeEntity.cpp')
| -rw-r--r-- | src/Entities/FireChargeEntity.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Entities/FireChargeEntity.cpp b/src/Entities/FireChargeEntity.cpp index 0db4b66d3..56ce9ef3f 100644 --- a/src/Entities/FireChargeEntity.cpp +++ b/src/Entities/FireChargeEntity.cpp @@ -43,9 +43,11 @@ void cFireChargeEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_ void cFireChargeEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) { + super::OnHitEntity(a_EntityHit, a_HitPos); + Destroy(); Explode(a_HitPos.Floor()); - + if (!a_EntityHit.IsFireproof()) { // TODO Damage Entity with 5 damage(from http://minecraft.gamepedia.com/Blaze#Blaze_fireball) |