aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-07-30 22:03:06 +0200
committerGitHub <noreply@github.com>2021-07-30 22:03:06 +0200
commit6de43f86745c0397037638c314e259b919fbf4d5 (patch)
treef3b777c297a6e1ee467b5a859e4dff5960377c4a /src/main/java
parent99f8c40f2b37b72dea22fba9f05f74253a11dffb (diff)
parent1e7829f1c1c494bc84ff51d38ea6d194a5f423de (diff)
downloadGT5-Unofficial-6de43f86745c0397037638c314e259b919fbf4d5.tar.gz
GT5-Unofficial-6de43f86745c0397037638c314e259b919fbf4d5.tar.bz2
GT5-Unofficial-6de43f86745c0397037638c314e259b919fbf4d5.zip
Merge pull request #611 from Sphyix/experimental
changed rods to work with gt_utility hazmat check
Diffstat (limited to 'src/main/java')
-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);
}
}