diff options
| author | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-05-14 00:47:12 +0300 |
|---|---|---|
| committer | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-05-23 13:31:48 +0300 |
| commit | 07c352c2ad7be9c4160ba479016000d83f71f64c (patch) | |
| tree | 5cf9392240441be2ec91409d6d5a0f1561708dd9 /src/main/java | |
| parent | 45643ed032a239381d8b9009241a8d3002e4402c (diff) | |
| download | Skyblocker-07c352c2ad7be9c4160ba479016000d83f71f64c.tar.gz Skyblocker-07c352c2ad7be9c4160ba479016000d83f71f64c.tar.bz2 Skyblocker-07c352c2ad7be9c4160ba479016000d83f71f64c.zip | |
Refactor null handling in EggFinder.checkIfEgg
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java | 7 |
1 files changed, 1 insertions, 6 deletions
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; } |