diff options
| author | Alexander Harkness <me@bearbin.net> | 2015-10-31 23:18:27 +0100 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2015-10-31 23:18:27 +0100 |
| commit | b13fd00ec44cc3fc4ad0395b3b9df04de00617b5 (patch) | |
| tree | 671987e9a48544fd0fc37135732feebdca697caa /src/Entities/FireChargeEntity.cpp | |
| parent | Merge pull request #2549 from cuberite/TouchGround (diff) | |
| parent | Implemented the FireResistence potion effects. (diff) | |
| download | cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.gz cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.bz2 cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.lz cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.xz cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.tar.zst cuberite-b13fd00ec44cc3fc4ad0395b3b9df04de00617b5.zip | |
Diffstat (limited to 'src/Entities/FireChargeEntity.cpp')
| -rw-r--r-- | src/Entities/FireChargeEntity.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Entities/FireChargeEntity.cpp b/src/Entities/FireChargeEntity.cpp index 10d83b8dd..0db4b66d3 100644 --- a/src/Entities/FireChargeEntity.cpp +++ b/src/Entities/FireChargeEntity.cpp @@ -46,6 +46,9 @@ void cFireChargeEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hi Destroy(); Explode(a_HitPos.Floor()); - // TODO: Some entities are immune to hits - a_EntityHit.StartBurning(5 * 20); // 5 seconds of burning + if (!a_EntityHit.IsFireproof()) + { + // TODO Damage Entity with 5 damage(from http://minecraft.gamepedia.com/Blaze#Blaze_fireball) + a_EntityHit.StartBurning(5 * 20); // 5 seconds of burning + } } |