From 0ce226d0c9a70facda7121a28a17b2228e6dbbb7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 5 Oct 2018 23:04:34 -0400 Subject: [PATCH] Fixed crash --- core/src/io/anuke/mindustry/maps/Sector.java | 1 + core/src/io/anuke/mindustry/maps/SectorPresets.java | 4 ++-- core/src/io/anuke/mindustry/maps/missions/Mission.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/maps/Sector.java b/core/src/io/anuke/mindustry/maps/Sector.java index 89f4a487fa..fa6af11a6b 100644 --- a/core/src/io/anuke/mindustry/maps/Sector.java +++ b/core/src/io/anuke/mindustry/maps/Sector.java @@ -27,6 +27,7 @@ public class Sector{ public int width = 1, height = 1; /**Num of missions in this sector that have been completed so far.*/ public int completedMissions; + /**Display texture. Needs to be disposed.*/ public transient Texture texture; /**Missions of this sector-- what needs to be accomplished to unlock it.*/ diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java index f830b3334f..3237770e12 100644 --- a/core/src/io/anuke/mindustry/maps/SectorPresets.java +++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java @@ -25,10 +25,10 @@ public class SectorPresets{ //TODO make 2x2 //TODO more gen info put(0, 1, new SectorPreset(Structs.array(new BlockMission(UnitBlocks.daggerFactory), Missions.blockRecipe(UnitBlocks.commandCenter), - new CommandMission(UnitCommand.retreat), new CommandMission(UnitCommand.attack), new BattleMission()), Array.with(Items.copper), 1)); + new CommandMission(UnitCommand.retreat), new CommandMission(UnitCommand.attack), new BattleMission()), Array.with(Items.copper), 1)); //reconstructor mission put(0, -1, new SectorPreset(Structs.array(Missions.blockRecipe(mobile ? UpgradeBlocks.tridentPad : UpgradeBlocks.deltaPad), - new MechMission(Mechs.delta)), Array.with(Items.copper), 1)); + new MechMission(Mechs.delta)), Array.with(Items.copper), 1)); //oil mission put(1, 0, new SectorPreset(Array.with(), Array.with(Items.copper), 1)); }}; diff --git a/core/src/io/anuke/mindustry/maps/missions/Mission.java b/core/src/io/anuke/mindustry/maps/missions/Mission.java index 9021860298..cc5a38f412 100644 --- a/core/src/io/anuke/mindustry/maps/missions/Mission.java +++ b/core/src/io/anuke/mindustry/maps/missions/Mission.java @@ -29,7 +29,7 @@ public abstract class Mission{ } public GameMode getMode(){ - return null; + return GameMode.noWaves; } /**Sets the message displayed on mission begin. Returns this mission for chaining.*/