From ce5bca120afa3b954ca631900d1dcceb90c73a3e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 8 Feb 2025 10:15:00 -0500 Subject: [PATCH] Fixed #10475 --- core/assets/baseparts/1591381320600.msch | 5 +++-- core/src/mindustry/maps/generators/BaseGenerator.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/assets/baseparts/1591381320600.msch b/core/assets/baseparts/1591381320600.msch index 9ec53eaf98..cec83fb258 100644 --- a/core/assets/baseparts/1591381320600.msch +++ b/core/assets/baseparts/1591381320600.msch @@ -1,2 +1,3 @@ -mschxE -0 `{>TA *g@.Ơ=on)v쎣 AlM,S&Ns/jO1!q` K,&[R(O6 E * ?ʻ.>hRSɖ-TQBTP5PA( \ No newline at end of file +mschxE +0D$FA(ê +1Jb)RJaB-- =mc nMX-yc 5lv{T;څܓ5eMfm}7nĺDs1a}\"CMT$Q$H!qDGJ䲌"! oȔ"210[ \ No newline at end of file diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java index 04cb90571e..ff3645bb7c 100644 --- a/core/src/mindustry/maps/generators/BaseGenerator.java +++ b/core/src/mindustry/maps/generators/BaseGenerator.java @@ -117,7 +117,7 @@ public class BaseGenerator{ } Tile o = tiles.get(tile.x + p.x, tile.y + p.y); - if(o != null && o.team() == team && !(o.block() instanceof Wall)){ + if(o != null && o.team() == team && !(o.block() instanceof Wall) && !(o.block() instanceof ShockMine)){ any = true; break; }