From 4eee4720434f7cef52a3e8965af3b5105ebed0d1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 16 Apr 2019 20:31:40 -0400 Subject: [PATCH] Blend fix --- core/src/io/anuke/mindustry/world/blocks/Floor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index 1a28bc833e..51d4a5aa32 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -153,7 +153,7 @@ public class Floor extends Block{ } protected boolean doEdge(Floor other, boolean sameLayer){ - return (other != this) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer); + return (other.blendGroup.id > blendGroup.id || edges() == null) && other.edgeOnto(this) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer); } protected boolean edgeOnto(Floor other){