diff options
| author | bibo38 <bibo38@github.com> | 2015-10-31 16:24:45 +0100 |
|---|---|---|
| committer | bibo38 <bibo38@github.com> | 2015-10-31 23:06:10 +0100 |
| commit | 73b8be0fef6603b5dd3a101c26a4947669068d5e (patch) | |
| tree | 671987e9a48544fd0fc37135732feebdca697caa /src/Entities/FireChargeEntity.cpp | |
| parent | Merge pull request #2549 from cuberite/TouchGround (diff) | |
| download | cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.gz cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.bz2 cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.lz cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.xz cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.tar.zst cuberite-73b8be0fef6603b5dd3a101c26a4947669068d5e.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 + } } |