From 47e639be281e20cd244de6afb999ee647cf52ea8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 15 Jul 2022 17:26:43 -0400
Subject: [PATCH] Fixed more objective bugs

---
 core/src/mindustry/core/NetClient.java     | 10 ++++++++++
 core/src/mindustry/game/MapObjectives.java |  7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index a792ee3620..415ed77556 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -331,6 +331,16 @@ public class NetClient implements ApplicationListener{
 
     @Remote(variants = Variant.both)
     public static void setObjectives(MapObjectives executor){
+        //clear old markers
+        for(var objective : state.rules.objectives){
+            for(var marker : objective.markers){
+                if(marker.wasAdded){
+                    marker.removed();
+                    marker.wasAdded = false;
+                }
+            }
+        }
+
         state.rules.objectives = executor;
     }
 
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index b588b1bba6..cf5fed390e 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -99,8 +99,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     /** Updates all objectives this executor contains. */
     public void update(){
-        //TODO am i doing this correctly
-        if(net.client()) return;
         eachRunning(obj -> {
             for(var marker : obj.markers){
                 if(!marker.wasAdded){
@@ -109,7 +107,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
                 }
             }
 
-            if(obj.update()){
+            //objectives cannot get completed on the client, but they do try to update for timers and such
+            if(obj.update() && !net.client()){
                 obj.completed = true;
                 obj.done();
                 for(var marker : obj.markers){
@@ -592,7 +591,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     /** Marker used for drawing UI to indicate something along with an objective. */
     public static abstract class ObjectiveMarker{
         /** Makes sure markers are only added once. */
-        private transient boolean wasAdded;
+        public transient boolean wasAdded;
 
         /** Called in the overlay draw layer.*/
         public void draw(){}