From 07c352c2ad7be9c4160ba479016000d83f71f64c Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Tue, 14 May 2024 00:47:12 +0300
Subject: Refactor null handling in EggFinder.checkIfEgg

---
 .../de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
index e796717f..91aa39db 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
@@ -22,10 +22,6 @@ import org.slf4j.LoggerFactory;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder.EggType.BREAKFAST;
-import static de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder.EggType.DINNER;
-import static de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder.EggType.LUNCH;
-
 public class EggFinder {
 	private static final Pattern eggFoundPattern = Pattern.compile("^(?:HOPPITY'S HUNT You found a Chocolate|You have already collected this Chocolate) (Breakfast|Lunch|Dinner)");
 	private static final Pattern newEggPattern = Pattern.compile("^HOPPITY'S HUNT A Chocolate (Breakfast|Lunch|Dinner) Egg has appeared!$");
@@ -42,12 +38,11 @@ public class EggFinder {
 
 	public static void checkIfEgg(Entity entity) {
 		if (!SkyblockerConfigManager.get().helpers.chocolateFactory.enableEggFinder) return;
-		if (BREAKFAST.egg.getValue() != null && DINNER.egg.getValue() != null && LUNCH.egg.getValue() != null) return; //Don't check for eggs if we already found all of them
 		if (!(entity instanceof ArmorStandEntity armorStand) || armorStand.hasCustomName() || !armorStand.isInvisible() || !armorStand.shouldHideBasePlate()) return;
 		for (ItemStack itemStack : armorStand.getArmorItems()) {
 			ItemUtils.getHeadTexture(itemStack).ifPresent(texture -> {
 				for (EggType type : EggType.entries) {
-					if (texture.equals(type.texture)) {
+					if (texture.equals(type.texture) && type.egg.getValue() == null) {
 						handleFoundEgg(armorStand, type);
 						return;
 					}
-- 
cgit