From d0048f32def8fe2685fcb4eb35ee8b506244c824 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 9 Sep 2026 17:55:43 -0400
Subject: [PATCH] Merge fixes

---
 core/src/mindustry/game/MapObjectives.java | 29 +++++++---------------
 core/src/mindustry/logic/LExecutor.java    |  2 +-
 gradle.properties                          |  2 +-
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index b350a972f8..ce45123ee3 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -780,26 +780,6 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             return Core.bundle == null ? className : Core.bundle.get("marker." + className.toLowerCase() + ".name", className);
         }
 
-        @Override
-        public void write(Json json){
-            json.writeFields(this);
-        }
-
-        private void updateField(JsonValue value){
-            if(value != null && value.type() != JsonValue.ValueType.longValue){
-                value.set(value.asBoolean() ? 1 : -1, null);
-            }
-        }
-
-        @Override
-        public void read(Json json, JsonValue jsonData){
-            updateField(jsonData.get("world"));
-            updateField(jsonData.get("minimap"));
-            updateField(jsonData.get("light"));
-            json.readFields(this, jsonData);
-            if(jsonData.has("textureName")) setTexture(jsonData.getString("textureName"));
-        }
-
         public static String fetchText(String text){
             if(text == null) return "";
 
@@ -831,8 +811,17 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
             json.writeFields(writer, this);
         }
 
+        private void updateField(Jval value, String name){
+            Jval sub = value.get(name);
+            if(sub != null && sub.isBoolean()) value.put(name, sub.asBool() ? 1 : -1);
+        }
+
         @Override
         public void read(Json json, Jval jsonData){
+            updateField(jsonData, "world");
+            updateField(jsonData, "minimap");
+            updateField(jsonData, "light");
+
             json.readFields(this, jsonData);
             if(jsonData.has("textureName")) setTexture(jsonData.getString("textureName"));
         }
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index c50ce47f91..0b5968c937 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -691,7 +691,7 @@ public class LExecutor{
             //note that remote units/buildings can be sensed as well
             if(target instanceof Senseable se){
                 if(sense instanceof LAccess la){
-                    if(exec.privileged || !la.isPrivileged()){
+                    if(exec.privileged || !la.privileged){
                         Object objOut = se.senseObject(la);
 
                         if(objOut == Senseable.noSensed){
diff --git a/gradle.properties b/gradle.properties
index 0339c1d395..ee72bdeb09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=dbb516c662
+archash=b43a5b04ce