Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #11680

Browse Source
This commit is contained in:
Anuken
2026-02-16 11:38:56 -05:00
parent a3682756dc
commit ca04662341
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ui/dialogs/PlanetDialog.java
+15 -8
View File
@@ -434,8 +434,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
@Nullable Sector findLauncher(Sector to){ @Nullable Sector findLauncher(Sector to){
if(mode == planetLaunch || to.planet.generator == null) return launchSector; if(mode == planetLaunch || to.planet.generator == null) return launchSector;
Sector candidate = to.planet.generator.findLaunchCandidate(to, launchSector); Sector actualLaunchSector = (launchSector != null && launchSector.planet == to.planet ? launchSector : null);
return candidate == null && launchSector != null && (mode == planetLaunch || !launchSector.isAttacked()) ? launchSector : candidate;
Sector candidate = to.planet.generator.findLaunchCandidate(to, actualLaunchSector);
return candidate == null && actualLaunchSector != null && (mode == planetLaunch || !actualLaunchSector.isAttacked()) ? actualLaunchSector : candidate;
} }
boolean showing(){ boolean showing(){
@@ -1275,7 +1277,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
stable.image().color(Pal.accent).fillX().height(3f).pad(3f).row(); stable.image().color(Pal.accent).fillX().height(3f).pad(3f).row();
boolean locked = sector.preset != null && sector.preset.locked() && !sector.hasBase() && sector.preset.techNode != null; boolean locked = isLocked(sector);
if(locked){ if(locked){
stable.table(r -> { stable.table(r -> {
@@ -1329,7 +1331,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
} }
} }
boolean noCandidate = sector != sector.planet.getStartSector() && !sector.hasBase() && findLauncher(sector) == null; boolean noCandidate = hasNoCandidate(sector);
stable.button( stable.button(
mode == select ? "@sectors.select" : mode == select ? "@sectors.select" :
@@ -1347,11 +1349,16 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
stable.act(0f); stable.act(0f);
} }
boolean canPlaySector(Sector sector){ boolean hasNoCandidate(Sector sector){
boolean noCandidate = sector != sector.planet.getStartSector() && !sector.hasBase() && findLauncher(sector) == null; return sector != sector.planet.getStartSector() && !sector.hasBase() && findLauncher(sector) == null;
boolean locked = sector.preset != null && sector.preset.locked() && !sector.hasBase() && sector.preset.techNode != null; }
return !locked && !noCandidate; boolean isLocked(Sector sector){
return sector.preset != null && sector.preset.locked() && !sector.hasBase() && sector.preset.techNode != null;
}
boolean canPlaySector(Sector sector){
return !isLocked(sector) && !hasNoCandidate(sector);
} }
void playSelected(){ void playSelected(){