Fix ender nodes detection

SkyblockerMod · Dec 22, 2024 · 299124b · 299124b
1 parent bcfade2
commit 299124b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EnderNodes.java
@@ -78,8 +78,11 @@ public static void onParticle(ParticleS2CPacket packet) {
 
         EnderNode enderNode = enderNodes.computeIfAbsent(pos, EnderNode::new);
         IntIntPair particles = enderNode.particles.get(direction);
-        particles.left(particles.leftInt() + 1);
-        particles.right(particles.rightInt() + 1);
+        if (ParticleTypes.PORTAL.getType().equals(particleType)) {
+            particles.left(particles.leftInt() + 1);
+        } else if (ParticleTypes.WITCH.getType().equals(particleType)) {
+            particles.right(particles.rightInt() + 1);
+        }
     }
 
     private static void update() {
@@ -120,7 +123,7 @@ Direction.NORTH, new IntIntMutablePair(0, 0)
         private long lastConfirmed;
 
         private EnderNode(BlockPos pos) {
-            super(pos, () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType, ColorUtils.getFloatComponents(DyeColor.CYAN), false);
+            super(pos, () -> SkyblockerConfigManager.get().uiAndVisuals.waypoints.waypointType.withoutBeacon(), ColorUtils.getFloatComponents(DyeColor.CYAN), false);
         }
 
         private void updateParticles() {

diff --git a/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java b/src/main/java/de/hysky/skyblocker/utils/waypoint/Waypoint.java
@@ -215,5 +215,13 @@ public String asString() {
         public String toString() {
             return I18n.translate("skyblocker.waypoints.type." + name());
         }
+
+        public Type withoutBeacon() {
+            return switch (this) {
+                case WAYPOINT -> HIGHLIGHT;
+                case OUTLINED_WAYPOINT -> OUTLINED_HIGHLIGHT;
+                default -> this;
+            };
+        }
     }
 }