diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-12 11:13:36 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-01-12 11:13:36 +0100 |
| commit | e2a053263f4798f879392756bb056eabf0ade3a4 (patch) | |
| tree | 5d543baa8842fe74c4ed66984860be483d28c627 /src/Entities/FireChargeEntity.cpp | |
| parent | Merge pull request #2853 from cuberite/DetailedBlockAreaLogging (diff) | |
| parent | Tamed wolf assists owner (attack / defence) (diff) | |
| download | cuberite-e2a053263f4798f879392756bb056eabf0ade3a4.tar cuberite-e2a053263f4798f879392756bb056eabf0ade3a4.tar.gz cuberite-e2a053263f4798f879392756bb056eabf0ade3a4.tar.bz2 cuberite-e2a053263f4798f879392756bb056eabf0ade3a4.tar.lz cuberite-e2a053263f4798f879392756bb056eabf0ade3a4.tar.xz cuberite-e2a053263f4798f879392756bb056eabf0ade3a4.tar.zst cuberite-e2a053263f4798f879392756bb056eabf0ade3a4.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) |