From 73b8be0fef6603b5dd3a101c26a4947669068d5e Mon Sep 17 00:00:00 2001 From: bibo38 Date: Sat, 31 Oct 2015 16:24:45 +0100 Subject: Implemented the FireResistence potion effects. This not only provides fire resistence, but also prevents blaze fireballs. See #2556 --- src/Entities/FireChargeEntity.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/Entities/FireChargeEntity.cpp') 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 + } } -- cgit v1.2.3