Fix crash related to removing death waypoints

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/systems/modules/render/WaypointsModule.java

@@ -37,8 +37,9 @@
 import org.joml.Vector3d;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
+import java.util.List;
 
 import static meteordevelopment.meteorclient.utils.player.ChatUtils.formatCoords;
 
@@ -96,9 +97,8 @@ private void onRender2D(Render2DEvent event) {
         Vector3d center = new Vector3d(mc.getWindow().getFramebufferWidth() / 2.0, mc.getWindow().getFramebufferHeight() / 2.0, 0);
         int textRenderDist = textRenderDistance.get();
 
-        for (Iterator<Waypoint> it = Waypoints.get().iterator(); it.hasNext();) {
-            Waypoint waypoint = it.next();
-
+        List<Waypoint> toRemove = new ArrayList<>();
+        for (Waypoint waypoint : Waypoints.get()) {
             // Continue if this waypoint should not be rendered
             if (!waypoint.visible.get() || !Waypoints.checkDimension(waypoint)) continue;
 
@@ -114,7 +114,10 @@ private void onRender2D(Render2DEvent event) {
             if (playerAlive && waypointIsNear) {
                 switch (waypoint.actionWhenNear.get()) {
                     case Hide -> waypoint.visible.set(false);
-                    case Delete -> it.remove();
+                    case Delete -> {
+                        toRemove.add(waypoint);
+                        continue;
+                    }
                 }
             }
 
@@ -158,6 +161,8 @@ private void onRender2D(Render2DEvent event) {
 
             NametagUtils.end();
         }
+
+        Waypoints.get().removeAll(toRemove);
     }
 
     @EventHandler
@@ -198,16 +203,16 @@ public void addDeath(Vec3d deathPos) {
     private void cleanDeathWPs(int max) {
         int oldWpC = 0;
 
-        for (Iterator<Waypoint> it = Waypoints.get().iterator(); it.hasNext();) {
-            Waypoint wp = it.next();
-
+        List<Waypoint> toRemove = new ArrayList<>();
+        for (Waypoint wp : Waypoints.get()) {
             if (wp.name.get().startsWith("Death ") && wp.icon.get().equals("skull")) {
                 oldWpC++;
 
-                if (oldWpC > max)
-                    it.remove();
+                if (oldWpC > max) toRemove.add(wp);
             }
         }
+
+        Waypoints.get().removeAll(toRemove);
     }
 
     @Override

src/main/java/meteordevelopment/meteorclient/systems/waypoints/Waypoints.java

@@ -31,7 +31,10 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -107,6 +110,11 @@ public boolean remove(Waypoint waypoint) {
         return removed;
     }
 
+    public void removeAll(Collection<Waypoint> c) {
+        boolean removed = waypoints.removeAll(c);
+        if (removed) save();
+    }
+
     public Waypoint get(String name) {
         for (Waypoint waypoint : waypoints) {
             if (waypoint.name.get().equalsIgnoreCase(name)) return waypoint;

src/main/java/meteordevelopment/meteorclient/systems/waypoints/events/WaypointAddedEvent.java

@@ -7,6 +7,7 @@
 
 import meteordevelopment.meteorclient.systems.waypoints.Waypoint;
 
+@Deprecated()
 public class WaypointAddedEvent {
 
     public final Waypoint waypoint;

src/main/java/meteordevelopment/meteorclient/systems/waypoints/events/WaypointRemovedEvent.java

@@ -7,6 +7,7 @@
 
 import meteordevelopment.meteorclient.systems.waypoints.Waypoint;
 
+@Deprecated()
 public class WaypointRemovedEvent {
 
     public final Waypoint waypoint;