From 9d49b5857103ee9ef76abb6187bf6dc314c4a3b7 Mon Sep 17 00:00:00 2001
From: Cardillan <122014763+cardillan@users.noreply.github.com>
Date: Sat, 29 Aug 2026 00:15:49 +0200
Subject: [PATCH] More tileable display fixes (#12514)

---
 core/src/mindustry/game/MapObjectives.java                | 4 ++--
 core/src/mindustry/world/blocks/logic/LogicDisplay.java   | 7 ++++---
 .../world/blocks/logic/TileableLogicDisplay.java          | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/mindustry/game/MapObjectives.java b/core/src/mindustry/game/MapObjectives.java
index db871aa96c..994f333628 100644
--- a/core/src/mindustry/game/MapObjectives.java
+++ b/core/src/mindustry/game/MapObjectives.java
@@ -1415,10 +1415,10 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
 
     private static void prepareTexture(ObjectiveMarker marker, Object texture){
         if(texture instanceof LogicDisplayBuild d && d.isAdded()){
-            if(d.buffer == null || d.buffer.isDisposed()){
+            if(d.rootDisplay.buffer == null || d.rootDisplay.buffer.isDisposed()){
                 marker.setTexture("error");
             }else{
-                d.processCommands();
+                d.rootDisplay.processCommands();
             }
         }else if(texture instanceof CanvasBuild c && c.isAdded()){
             if(c.texture == null || c.texture.isDisposed()){
diff --git a/core/src/mindustry/world/blocks/logic/LogicDisplay.java b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
index 5e14c3e038..e0c8769833 100644
--- a/core/src/mindustry/world/blocks/logic/LogicDisplay.java
+++ b/core/src/mindustry/world/blocks/logic/LogicDisplay.java
@@ -148,8 +148,9 @@ public class LogicDisplay extends Block{
         }
 
         public void getBufferRegion(TextureRegion region){
-            if(buffer != null){
-                region.set(buffer.getTexture(), 0, buffer.getTexture().height, buffer.getTexture().width, -buffer.getTexture().height);
+            if(rootDisplay.buffer != null){
+                region.set(rootDisplay.buffer.getTexture(), 0, rootDisplay.buffer.getTexture().height,
+                rootDisplay.buffer.getTexture().width, -rootDisplay.buffer.getTexture().height);
             }
         }
 
@@ -195,7 +196,7 @@ public class LogicDisplay extends Block{
                                 int id = packed >> 5;
                                 if(ctype == displayDrawType){
                                     if(id != index && id < displays.size && id >= 0 && displays.get(id).buffer != null){
-                                        displays.get(id).getBufferRegion(Tmp.tr1);
+                                        displays.get(id).rootDisplay.getBufferRegion(Tmp.tr1);
                                         Draw.rect(Tmp.tr1, x, y, p2, p2 / Tmp.tr1.ratio(), p3);
                                     }
                                 }else if(ctype < ContentType.all.length && Vars.content.getByID(ContentType.all[ctype], id) instanceof UnlockableContent u){
diff --git a/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java b/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java
index d0085d8562..d772e62899 100644
--- a/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java
+++ b/core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java
@@ -269,11 +269,11 @@ public class TileableLogicDisplay extends LogicDisplay{
 
         @Override
         public void ensureBuffer() {
-            if(buffer == null){
-                buffer = new FrameBuffer(32 * tilesWidth - 2 * frameSize, 32 * tilesHeight - 2 * frameSize);
+            if(rootDisplay.buffer == null){
+                rootDisplay.buffer = new FrameBuffer(32 * tilesWidth - 2 * frameSize, 32 * tilesHeight - 2 * frameSize);
                 //clear the buffer - some OSs leave garbage in it
-                buffer.begin(backgroundColor);
-                buffer.end();
+                rootDisplay.buffer.begin(backgroundColor);
+                rootDisplay.buffer.end();
             }
         }