From 0b8332d525c95ec54ce1312217e3eb95af950192 Mon Sep 17 00:00:00 2001
From: George Paton <georgep@webforcefive.com.au>
Date: Sun, 7 Apr 2024 17:23:59 +1000
Subject: [PATCH] Play full counts if the player also has a regular counter

---
 src/main/java/com/hbm/items/armor/ArmorFSB.java         | 4 ++++
 src/main/java/com/hbm/items/tool/ItemDosimeter.java     | 7 -------
 src/main/java/com/hbm/items/tool/ItemGeigerCounter.java | 7 -------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java
index 912a11dcc..de7a67afa 100644
--- a/src/main/java/com/hbm/items/armor/ArmorFSB.java
+++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java
@@ -12,6 +12,7 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.extprop.HbmLivingProps;
 import com.hbm.handler.radiation.ChunkRadiationManager;
+import com.hbm.items.ModItems;
 import com.hbm.util.ContaminationUtil;
 import com.hbm.util.I18nUtil;
 
@@ -576,6 +577,9 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel {
 		if(!hasFSBArmor(entity) || !this.geigerSound)
 			return;
 
+		if(entity.inventory.hasItem(ModItems.geiger_counter) || entity.inventory.hasItem(ModItems.dosimeter))
+			return;
+
 		if(world.getTotalWorldTime() % 5 == 0) {
 
 			// Armor piece dosimeters indicate radiation dosage inside the armor, so reduce the counts by the effective protection
diff --git a/src/main/java/com/hbm/items/tool/ItemDosimeter.java b/src/main/java/com/hbm/items/tool/ItemDosimeter.java
index 3a6a1f4bf..c8eeb585d 100644
--- a/src/main/java/com/hbm/items/tool/ItemDosimeter.java
+++ b/src/main/java/com/hbm/items/tool/ItemDosimeter.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.extprop.HbmLivingProps;
-import com.hbm.items.armor.ArmorFSB;
 import com.hbm.util.ContaminationUtil;
 
 import net.minecraft.entity.Entity;
@@ -25,12 +24,6 @@ public class ItemDosimeter extends Item {
 		if(!(entity instanceof EntityLivingBase) || world.isRemote)
 			return;
 		
-		if(entity instanceof EntityPlayer) {
-			
-			if(ArmorFSB.hasFSBArmor((EntityPlayer)entity) && ((ArmorFSB)((EntityPlayer)entity).inventory.armorInventory[2].getItem()).geigerSound)
-				return;
-		}
-		
 		float x = HbmLivingProps.getRadBuf((EntityLivingBase)entity);
 		
 		if(world.getTotalWorldTime() % 5 == 0) {
diff --git a/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java b/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java
index 72be9d361..cc86cc758 100644
--- a/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java
+++ b/src/main/java/com/hbm/items/tool/ItemGeigerCounter.java
@@ -6,7 +6,6 @@ import java.util.Random;
 
 import com.hbm.extprop.HbmLivingProps;
 import com.hbm.handler.radiation.ChunkRadiationManager;
-import com.hbm.items.armor.ArmorFSB;
 import com.hbm.util.ContaminationUtil;
 
 import net.minecraft.entity.Entity;
@@ -27,12 +26,6 @@ public class ItemGeigerCounter extends Item {
 		if(!(entity instanceof EntityLivingBase) || world.isRemote)
 			return;
 		
-		if(entity instanceof EntityPlayer) {
-			
-			if(ArmorFSB.hasFSBArmor((EntityPlayer)entity) && ((ArmorFSB)((EntityPlayer)entity).inventory.armorInventory[2].getItem()).geigerSound)
-				return;
-		}
-		
 		float x = HbmLivingProps.getRadBuf((EntityLivingBase)entity);
 		
 		if(world.getTotalWorldTime() % 5 == 0) {