aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorD-Cysteine <54219287+D-Cysteine@users.noreply.github.com>2021-07-30 23:23:10 -0600
committerD-Cysteine <54219287+D-Cysteine@users.noreply.github.com>2021-07-30 23:23:10 -0600
commitc4746366afd5353dd36fd3a07e30b7382584cff4 (patch)
tree29a16e0b7cf4109f8516dcb75bbb352d244f6f2c /src/main/java/gregtech/api
parentc881c22bb0909246a58b2e6ebbb3930a3cfb9b11 (diff)
parentfa6765024a9670cf4f71734da60882246c2ccdf8 (diff)
downloadGT5-Unofficial-c4746366afd5353dd36fd3a07e30b7382584cff4.tar.gz
GT5-Unofficial-c4746366afd5353dd36fd3a07e30b7382584cff4.tar.bz2
GT5-Unofficial-c4746366afd5353dd36fd3a07e30b7382584cff4.zip
Merge branch 'experimental' of https://github.com/D-Cysteine/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
index e24ed04539..7950672ec2 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
@@ -2,6 +2,7 @@ package gregtech.api.items;
import gregtech.api.GregTech_API;
+import gregtech.api.util.GT_Utility;
import ic2.api.reactor.IReactor;
import ic2.api.reactor.IReactorComponent;
import ic2.core.IC2Potion;
@@ -153,7 +154,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
if (this.sRadiation > 0 && (entity instanceof EntityLivingBase)) {
EntityLivingBase entityLiving = (EntityLivingBase) entity;
- if (!GregTech_API.mIC2Classic&&!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
+ if (!GregTech_API.mIC2Classic&&!GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
}
}