From 67db5e9dfc2ae35375f9da52fe5b332debf3c89f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 10 Oct 2018 17:34:36 -0400
Subject: [PATCH] Nothing

---
 core/src/io/anuke/mindustry/entities/Unit.java         |  6 +++---
 core/src/io/anuke/mindustry/maps/Sectors.java          | 10 ----------
 .../mindustry/maps/generation/WorldGenerator.java      |  2 +-
 .../anuke/mindustry/maps/missions/BattleMission.java   |  5 +++++
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java
index 9a1809b19a..d8a0cbe323 100644
--- a/core/src/io/anuke/mindustry/entities/Unit.java
+++ b/core/src/io/anuke/mindustry/entities/Unit.java
@@ -39,12 +39,12 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
     /**Maximum absolute value of a velocity vector component.*/
     public static final float maxAbsVelocity = 127f / velocityPercision;
 
-    public UnitInventory inventory = new UnitInventory(this);
+    public final UnitInventory inventory = new UnitInventory(this);
     public float rotation;
     public float hitTime;
 
-    protected Interpolator interpolator = new Interpolator();
-    protected StatusController status = new StatusController();
+    protected final Interpolator interpolator = new Interpolator();
+    protected final StatusController status = new StatusController();
     protected Team team = Team.blue;
 
     protected CarryTrait carrier;
diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java
index 4e6762e836..04f9e60328 100644
--- a/core/src/io/anuke/mindustry/maps/Sectors.java
+++ b/core/src/io/anuke/mindustry/maps/Sectors.java
@@ -184,16 +184,6 @@ public class Sectors{
 
         return true;
     }
-    /*
-    private boolean canMerge(Sector s1, Sector s2){
-        int minx = Math.min(s1.x, s2.x);
-        int miny = Math.min(s1.y, s2.y);
-
-        int maxx = Math.max(s1.x + s1.width, s2.x + s2.width);
-        int maxy = Math.max(s1.y + s1.height, s2.y + s2.height);
-
-
-    }*/
 
     /**Returns whether a sector of this size and position can be fit here.*/
     public boolean canFit(int x, int y, int width, int height){
diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
index e27edb4bce..6f4c6d4f12 100644
--- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
@@ -20,10 +20,10 @@ import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.OreBlock;
 import io.anuke.ucore.noise.RidgedPerlin;
 import io.anuke.ucore.noise.Simplex;
-import io.anuke.ucore.util.Structs;
 import io.anuke.ucore.util.Geometry;
 import io.anuke.ucore.util.Mathf;
 import io.anuke.ucore.util.SeedRandom;
+import io.anuke.ucore.util.Structs;
 
 import static io.anuke.mindustry.Vars.sectorSize;
 import static io.anuke.mindustry.Vars.world;
diff --git a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java
index fe48bf521f..be0b4d8769 100644
--- a/core/src/io/anuke/mindustry/maps/missions/BattleMission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/BattleMission.java
@@ -31,6 +31,11 @@ public class BattleMission extends Mission{
         //new FortressGenerator().generate(gen, Team.red, coreX, coreY, enemyX, enemyY);
     }
 
+    @Override
+    public void onBegin(){
+
+    }
+
     @Override
     public boolean isComplete(){
         for(Team team : Vars.state.teams.enemiesOf(Vars.defaultTeam)){