From a4c07d2f98edb650d586caaa08feb8f4b16cc639 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Tue, 12 Sep 2017 09:02:17 +0100
Subject: Adjust lava damage values (#4020)

Fixes isue #2925
---
 src/Entities/Entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Entities/Entity.cpp')

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index a57449122..90aefd082 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1277,7 +1277,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
 		m_TicksSinceLastFireDamage++;
 		if (m_TicksSinceLastFireDamage >= FIRE_TICKS_PER_DAMAGE)
 		{
-			if (!IsFireproof())
+			if (!IsFireproof() && !HasLava)
 			{
 				TakeDamage(dtFireContact, nullptr, FIRE_DAMAGE, 0);
 			}
-- 
cgit v1.2.3