From a00b3a4670c2828ca31642ef6842c49913127e0c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 12 Jun 2023 10:35:31 -0400
Subject: [PATCH] Fixed objective flags not syncing

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

diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index d9fa35135a..699a5ce3cd 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -355,6 +355,12 @@ public class NetClient implements ApplicationListener{
         state.rules.objectives = executor;
     }
 
+    @Remote(called = Loc.server)
+    public static void objectiveCompleted(String[] flagsRemoved, String[] flagsAdded){
+        state.rules.objectiveFlags.removeAll(flagsRemoved);
+        state.rules.objectiveFlags.addAll(flagsAdded);
+    }
+
     @Remote(variants = Variant.both)
     public static void worldDataBegin(){
         Groups.clear();
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index f7dc7a067e..21717202bc 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -193,8 +193,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         /** Called once after {@link #update()} returns true, before this objective is removed. */
         public void done(){
             changed();
-            state.rules.objectiveFlags.removeAll(flagsRemoved);
-            state.rules.objectiveFlags.addAll(flagsAdded);
+            Call.objectiveCompleted(flagsRemoved, flagsAdded);
         }
 
         /** Notifies the executor that map rules should be synced. */
@@ -206,12 +205,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public final boolean dependencyFinished(){
             if(depFinished) return true;
 
-            boolean f = true;
             for(var parent : parents){
                 if(!parent.isCompleted()) return false;
             }
 
-            return f && (depFinished = true);
+            return depFinished = true;
         }
 
         /** @return True if this objective is done (practically, has been removed from the executor). */