From f0d37281d489cf018432c5ea414834b61640dd7d Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Sat, 3 Feb 2024 18:17:17 +0100
Subject: [PATCH] Marker fixes (#9514)

---
 core/src/mindustry/game/MapObjectives.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index 466068c4eb..94b57d4d59 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -1143,6 +1143,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
     public static class QuadMarker extends ObjectiveMarker{
         public String textureName = "white";
         public @Vertices float[] vertices = new float[24];
+        private boolean mapRegion = true;
 
         private transient TextureRegion fetchedRegion;
 
@@ -1201,11 +1202,15 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
             lookupRegion(textureName, fetchedRegion);
 
-            if(firstUpdate) {
-                // possibly from the editor, we need to clamp the values
-                for(int i = 0; i < 4; i++){
-                    vertices[i * 6 + 3] = Mathf.map(Mathf.clamp(vertices[i * 6 + 3]), fetchedRegion.u, fetchedRegion.u2);
-                    vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp(vertices[i * 6 + 4]), fetchedRegion.v, fetchedRegion.v2);
+            if(firstUpdate){
+                if(mapRegion){
+                    mapRegion = false;
+
+                    // possibly from the editor, we need to clamp the values
+                    for(int i = 0; i < 4; i++){
+                        vertices[i * 6 + 3] = Mathf.map(Mathf.clamp(vertices[i * 6 + 3]), fetchedRegion.u, fetchedRegion.u2);
+                        vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp(vertices[i * 6 + 4]), fetchedRegion.v, fetchedRegion.v2);
+                    }
                 }
             }else{
                 for(int i = 0; i < 4; i++){
@@ -1230,6 +1235,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
         private void setUv(int i, double u, double v){
             if(i >= 0 && i < 4){
+                if(fetchedRegion == null) setTexture(textureName);
+
                 if(!Double.isNaN(u)) vertices[i * 6 + 3] = Mathf.map(Mathf.clamp((float)u), fetchedRegion.u, fetchedRegion.u2);
                 if(!Double.isNaN(v)) vertices[i * 6 + 4] = Mathf.map(1 - Mathf.clamp((float)v), fetchedRegion.v, fetchedRegion.v2);
             }