aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-09-02 04:13:03 -0400
committerGitHub <noreply@github.com>2024-09-02 04:13:03 -0400
commit49c54f3745b1e59e3c7d6f7565f373bddc8b1969 (patch)
tree6eadce3dd945804a1ce5f39c3b416d1301dc9858 /src
parent13a7acaabbc1c470b454e02375f3de7b11dd7d47 (diff)
downloadSkyblocker-49c54f3745b1e59e3c7d6f7565f373bddc8b1969.tar.gz
Skyblocker-49c54f3745b1e59e3c7d6f7565f373bddc8b1969.tar.bz2
Skyblocker-49c54f3745b1e59e3c7d6f7565f373bddc8b1969.zip
Fix Egg Finder bugs (#978)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java12
1 files changed, 10 insertions, 2 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 6d390039..d616d85a 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java
@@ -8,6 +8,7 @@ import de.hysky.skyblocker.utils.*;
import de.hysky.skyblocker.utils.command.argumenttypes.EggTypeArgumentType;
import de.hysky.skyblocker.utils.command.argumenttypes.blockpos.ClientBlockPosArgumentType;
import de.hysky.skyblocker.utils.command.argumenttypes.blockpos.ClientPosArgument;
+import de.hysky.skyblocker.utils.render.FrustumUtils;
import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
import de.hysky.skyblocker.utils.waypoint.Waypoint;
import it.unimi.dsi.fastutil.objects.ObjectImmutableList;
@@ -55,7 +56,14 @@ public class EggFinder {
private EggFinder() {}
public static void init() {
- ClientPlayConnectionEvents.JOIN.register((ignored, ignored2, ignored3) -> isLocationCorrect = false);
+ ClientPlayConnectionEvents.JOIN.register((ignored, ignored2, ignored3) -> {
+ isLocationCorrect = false;
+
+ for (EggType type : EggType.entries) {
+ type.collected = false;
+ type.egg = null;
+ }
+ });
SkyblockEvents.LOCATION_CHANGE.register(EggFinder::handleLocationChange);
ClientReceiveMessageEvents.GAME.register(EggFinder::onChatMessage);
WorldRenderEvents.AFTER_TRANSLUCENT.register(EggFinder::renderWaypoints);
@@ -64,7 +72,7 @@ public class EggFinder {
if (!isLocationCorrect || SkyblockTime.skyblockSeason.get() != SkyblockTime.Season.SPRING) return;
for (EggType type : EggType.entries) {
Egg egg = type.egg;
- if (egg != null && !egg.seen && client.player.canSee(egg.entity)) {
+ if (egg != null && !egg.seen && FrustumUtils.isVisible(egg.entity.getBoundingBox()) && client.player.canSee(egg.entity)) {
type.setSeen();
}
}