From 28227646984ccd3ae0b0eb7a12d0f3f72b7da18d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 1 Oct 2022 20:55:30 -0400
Subject: [PATCH] Test fixes

---
 .../mindustry/maps/generators/FileMapGenerator.java   |  2 +-
 .../src/mindustry/ui/dialogs/LaunchLoadoutDialog.java | 11 +++++++++++
 tests/src/test/java/ApplicationTests.java             |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/maps/generators/FileMapGenerator.java b/core/src/mindustry/maps/generators/FileMapGenerator.java
index 4d49825cff..621fae9696 100644
--- a/core/src/mindustry/maps/generators/FileMapGenerator.java
+++ b/core/src/mindustry/maps/generators/FileMapGenerator.java
@@ -77,7 +77,7 @@ public class FileMapGenerator implements WorldGenerator{
             }
 
             if(tile.isCenter() && tile.block() instanceof CoreBlock && tile.team() == state.rules.defaultTeam && !anyCores){
-                if(sector != null && sector.allowLaunchLoadout()){
+                if(state.rules.sector != null && state.rules.sector.allowLaunchLoadout()){
                     Schematics.placeLaunchLoadout(tile.x, tile.y);
                 }
                 anyCores = true;
diff --git a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
index abd86f80a6..61d3358233 100644
--- a/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
+++ b/core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
@@ -44,6 +44,17 @@ public class LaunchLoadoutDialog extends BaseDialog{
 
         ItemSeq sitems = sector.items();
 
+        //hide nonsensical items
+        ItemSeq launch = universe.getLaunchResources();
+        if(sector.planet.allowLaunchLoadout){
+            for(var item : content.items()){
+                if(sector.planet.hiddenItems.contains(item)){
+                    launch.set(item, 0);
+                }
+            }
+            universe.updateLaunchResources(launch);
+        }
+
         //updates sum requirements
         Runnable update = () -> {
             int cap = lastCapacity = (int)(sector.planet.launchCapacityMultiplier * selected.findCore().itemCapacity);
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 8c58a09885..2c04ab2a56 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -873,6 +873,7 @@ public class ApplicationTests{
                 Time.setDeltaProvider(() -> 1f);
 
                 logic.reset();
+                state.rules.sector = zone.sector;
                 try{
                     world.loadGenerator(zone.generator.map.width, zone.generator.map.height, zone.generator::generate);
                 }catch(SaveException e){