Skip to content

Commit 0ea0cb6

Browse files
committed
Make expiration epoch optional for sending
1 parent f876264 commit 0ea0cb6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/EggFinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private static boolean onChatMessage(Component text, boolean overlay) {
192192
return true;
193193
}
194194
WsMessageHandler.sendLocationMessage(Service.EGG_WAYPOINTS,
195-
new EggWaypointMessage(eggType, eggType.egg.pos, Long.MAX_VALUE));
195+
new EggWaypointMessage(eggType, eggType.egg.pos, Optional.empty()));
196196
} catch (IllegalArgumentException e) {
197197
LOGGER.error("[Skyblocker Egg Finder] Failed to process an egg!", e);
198198
}

src/main/java/de/hysky/skyblocker/utils/ws/message/EggWaypointMessage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import java.util.Optional;
1111
import net.minecraft.core.BlockPos;
1212

13-
public record EggWaypointMessage(EggFinder.EggType eggType, BlockPos coordinates, long expirationEpoch) implements Message<EggWaypointMessage> {
13+
public record EggWaypointMessage(EggFinder.EggType eggType, BlockPos coordinates, Optional<Long> expirationEpoch) implements Message<EggWaypointMessage> {
1414
private static final Codec<EggWaypointMessage> CODEC = RecordCodecBuilder.create(instance -> instance.group(
1515
EggFinder.EggType.CODEC.fieldOf("eggType").forGetter(EggWaypointMessage::eggType),
1616
BlockPos.CODEC.fieldOf("coordinates").forGetter(EggWaypointMessage::coordinates),
17-
Codec.LONG.fieldOf("expirationEpoch").forGetter(EggWaypointMessage::expirationEpoch)
17+
Codec.LONG.optionalFieldOf("expirationEpoch").forGetter(EggWaypointMessage::expirationEpoch)
1818
).apply(instance, EggWaypointMessage::new));
1919

2020
private static final Codec<List<EggWaypointMessage>> LIST_CODEC = CODEC.listOf();
@@ -34,7 +34,7 @@ public static void handle(Type type, Optional<Dynamic<?>> message) {
3434
long now = System.currentTimeMillis();
3535

3636
RenderHelper.runOnRenderThread(() -> waypoints.stream()
37-
.filter(w -> w.expirationEpoch() > now)
37+
.filter(w -> w.expirationEpoch.isPresent() && w.expirationEpoch().get() > now)
3838
.forEach(EggFinder::onWebsocketMessage));
3939
}
4040

0 commit comments

Comments
 (0)