Merge branch '1.20.1' into 1.20.2

rfresh2 · Sep 6, 2024 · ad2db76 · ad2db76
2 parents 877439c + f3a1c74
commit ad2db76
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/common/src/main/java/xaeroplus/module/impl/BaritoneGoalSync.java b/common/src/main/java/xaeroplus/module/impl/BaritoneGoalSync.java
@@ -41,6 +41,8 @@ public void onClientTickEvent(final ClientTickEvent.Post event) {
         if (minimapSession == null) return;
         MinimapWorld currentWorld = minimapSession.getWorldManager().getCurrentWorld();
         if (currentWorld == null) return;
+        WaypointSet currentWpSet = currentWorld.getCurrentWaypointSet();
+        if (currentWpSet == null) return;
         try {
             final Goal goal = BaritoneGoalHelper.getBaritoneGoal();
             if (goal == null) {
@@ -62,10 +64,11 @@ public void onClientTickEvent(final ClientTickEvent.Post event) {
                 baritoneGoalPos = new WeakReference<>(baritoneGoalBlockPos);
             }
 
-            if (baritoneWpMinimapWorldRef.get() == null || currentWorld != baritoneWpMinimapWorldRef.get()) {
-                Waypoint baritoneWp = this.baritoneWpRef.get();
-                WaypointSet waypointSet = baritoneWpSetRef.get();
-                if (waypointSet != null && baritoneWp != null) waypointSet.remove(baritoneWp);
+            if (baritoneWpMinimapWorldRef.get() == null || currentWorld != baritoneWpMinimapWorldRef.get()
+                || baritoneWpSetRef.get() == null || baritoneWpSetRef.get() != currentWpSet) {
+                if (baritoneWpSetRef.get() != null && baritoneWpRef.get() != null) {
+                    baritoneWpSetRef.get().remove(baritoneWpRef.get());
+                }
                 baritoneWpRef = nullRef;
                 initBaritoneWpWorld(currentWorld);
             }
@@ -116,7 +119,7 @@ private double getBaritoneWpDimDiv() {
 
     private void initBaritoneWpWorld(final MinimapWorld currentWorld) {
         baritoneWpMinimapWorldRef = new WeakReference<>(currentWorld);
-        WaypointSet waypointSet = baritoneWpMinimapWorldRef.get().getWaypointSet("gui.xaero_default");
+        WaypointSet waypointSet = baritoneWpMinimapWorldRef.get().getCurrentWaypointSet();
         baritoneWpSetRef = new WeakReference<>(waypointSet);
     }