From 7440f195ba862a1fdc0996cd3688fc9f109ddf0f Mon Sep 17 00:00:00 2001
From: Redstonneur1256 <29004178+Redstonneur1256@users.noreply.github.com>
Date: Mon, 15 Jan 2024 03:55:37 +0100
Subject: [PATCH] Allow markers to use any texture (#9455)

---
 core/assets/contributors                   |  1 +
 core/src/mindustry/game/MapObjectives.java | 26 ++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/assets/contributors b/core/assets/contributors
index f3c6f10bfc..b16023715e 100644
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -163,3 +163,4 @@ Yoru Kitsune
 summoner
 OpalSoPL
 BalaM314
+Redstonneur1256
diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index f6a474399b..dd64aa9106 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -1156,27 +1156,35 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
         public void baseDraw(float x, float y, float scaleFactor){
             if(textureName.isEmpty()) return;
 
-            if(fetchedRegion == null) fetchedRegion = Core.atlas.find(textureName);
+            if(fetchedRegion == null) setTexture(textureName);
 
             // Zero width/height scales marker to original texture's size
             if(Mathf.equal(width, 0f)) width = fetchedRegion.width * fetchedRegion.scl() * Draw.xscl;
             if(Mathf.equal(height, 0f)) height = fetchedRegion.height * fetchedRegion.scl() * Draw.yscl;
 
             Draw.z(drawLayer);
-            if(fetchedRegion.found()){
-                Draw.color(color);
-                Draw.rect(fetchedRegion, x, y, width * scaleFactor, height * scaleFactor, rotation);
-            }else{
-                Draw.color(Color.white);
-                Draw.rect("error", x, y, width * scaleFactor, height * scaleFactor, rotation);
-            }
+            Draw.color(color);
+            Draw.rect(fetchedRegion, x, y, width * scaleFactor, height * scaleFactor, rotation);
         }
 
         @Override
         public void setTexture(String textureName){
             this.textureName = textureName;
-            fetchedRegion = Core.atlas.find(textureName);
+
+            if(fetchedRegion == null) fetchedRegion = new TextureRegion();
+
+            TextureRegion region = Core.atlas.find(textureName);
+            if(region.found()){
+               fetchedRegion.set(region);
+            }else{
+                if(Core.assets.isLoaded(textureName, Texture.class)){
+                    fetchedRegion.set(Core.assets.get(textureName, Texture.class));
+                }else{
+                    fetchedRegion.set(Core.atlas.find("error"));
+                }
+            }
         }
+
     }
 
     /** For arrays or {@link Seq}s; does not create element rearrangement buttons. */