From 69377bab3ff7b96fc9a6b98405290523b7c36375 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 27 Jul 2023 15:48:32 -0400
Subject: [PATCH] Fixed #8849

---
 core/src/mindustry/service/GameService.java            | 6 ++++++
 core/src/mindustry/world/blocks/environment/Floor.java | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/service/GameService.java b/core/src/mindustry/service/GameService.java
index 72e7a74740..79d9aec342 100644
--- a/core/src/mindustry/service/GameService.java
+++ b/core/src/mindustry/service/GameService.java
@@ -115,6 +115,12 @@ public class GameService{
             installMod.complete();
         }
 
+        Events.on(ClientLoadEvent.class, e -> {
+            if(mods.list().size > 0){
+                installMod.complete();
+            }
+        });
+
         if(Core.bundle.get("yes").equals("router")){
             routerLanguage.complete();
         }
diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java
index 56c7625f44..b942941799 100644
--- a/core/src/mindustry/world/blocks/environment/Floor.java
+++ b/core/src/mindustry/world/blocks/environment/Floor.java
@@ -233,7 +233,8 @@ public class Floor extends Block{
         for(int i = 0; i < 8; i++){
             Point2 point = Geometry.d8[i];
             Tile other = tile.nearby(point);
-            if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null){
+            //special case: empty is, well, empty, so never draw emptyness on top, as that would just be an incorrect black texture
+            if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null && other.floor() != Blocks.empty){
                 if(!blended.getAndSet(other.floor().id)){
                     blenders.add(other.floor());
                     dirs[i] = other.floorID();
@@ -305,8 +306,9 @@ public class Floor extends Block{
         return ((Floor)blendGroup).edges;
     }
 
+    /** @return whether the edges from {@param other} should be drawn onto this tile **/
     protected boolean doEdge(Tile tile, Tile otherTile, Floor other){
-        return other.realBlendId(otherTile) > realBlendId(tile) || edges() == null;
+        return (other.realBlendId(otherTile) > realBlendId(tile) || edges() == null);
     }
 
     TextureRegion edge(Floor block, int x, int y){