From 150e122dfa27eb79305f376ed8d4c6c8305808be Mon Sep 17 00:00:00 2001 From: Wilhelm Schuster Date: Wed, 7 Jun 2023 10:20:13 +0200 Subject: Enable fire resistance checks for heat and hot item damage (#2065) --- src/main/java/gregtech/api/util/GT_Utility.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 39ee06031d..d891545122 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2738,19 +2738,15 @@ public class GT_Utility { } private static boolean applyHeatDamage(EntityLivingBase aEntity, float aDamage, DamageSource source) { - if (aDamage > 0 && aEntity != null - && aEntity.getActivePotionEffect(Potion.fireResistance) == null - && !isWearingFullHeatHazmat(aEntity)) { - aEntity.attackEntityFrom(source, aDamage); - return true; + if (aDamage > 0 && aEntity != null && !isWearingFullHeatHazmat(aEntity)) { + return aEntity.attackEntityFrom(source, aDamage); } return false; } public static boolean applyFrostDamage(EntityLivingBase aEntity, float aDamage) { if (aDamage > 0 && aEntity != null && !isWearingFullFrostHazmat(aEntity)) { - aEntity.attackEntityFrom(GT_DamageSources.getFrostDamage(), aDamage); - return true; + return aEntity.attackEntityFrom(GT_DamageSources.getFrostDamage(), aDamage); } return false; } @@ -2758,8 +2754,7 @@ public class GT_Utility { public static boolean applyElectricityDamage(EntityLivingBase aEntity, long aVoltage, long aAmperage) { long aDamage = getTier(aVoltage) * aAmperage * 4; if (aDamage > 0 && aEntity != null && !isWearingFullElectroHazmat(aEntity)) { - aEntity.attackEntityFrom(GT_DamageSources.getElectricDamage(), aDamage); - return true; + return aEntity.attackEntityFrom(GT_DamageSources.getElectricDamage(), aDamage); } return false; } -- cgit