From e96c21d6100ae62bad0b0aa9f3f9c1b19a230674 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 7 Sep 2025 14:40:18 -0400 Subject: [PATCH] Fixed enemy cores being removed on map re-attempt --- core/src/mindustry/core/Control.java | 2 +- core/src/mindustry/maps/generators/FileMapGenerator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 6527211c47..87a0abd999 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -469,7 +469,7 @@ public class Control implements ApplicationListener, Loadable{ }}, () -> { var teamData = state.rules.defaultTeam.data(); - //all the old derelicts have to be removed. + //all the derelicts from the new save have to be removed. for(var generatedDerelict : Team.derelict.data().buildings.toArray(Building.class)){ generatedDerelict.tile.remove(); } diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java index c750786e79..31bd1903e2 100644 --- a/core/src/mindustry/maps/generators/FileMapGenerator.java +++ b/core/src/mindustry/maps/generators/FileMapGenerator.java @@ -101,7 +101,7 @@ public class FileMapGenerator implements WorldGenerator{ tile.build.items.clear(); tile.build.items.add(state.rules.loadout); } - }else if(tile.build instanceof CoreBuild && tile.build.pos() != params.corePositionOverride){ + }else if(tile.build instanceof CoreBuild && tile.team() == state.rules.defaultTeam && tile.build.pos() != params.corePositionOverride){ //other cores placed must be cleared; they have been overridden tile.remove(); }