From d49b15b2a0fdfecf05360895ea48986cc7847758 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 16 Sep 2019 08:24:10 -0400
Subject: [PATCH] Fixed some things

---
 android/build.gradle                                      | 6 +++++-
 core/src/io/anuke/mindustry/entities/units/Statuses.java  | 3 ++-
 core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 0f61c32912..032d268053 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -69,7 +69,8 @@ android{
     }
 
     defaultConfig{
-        Integer vcode = new Properties().with{p -> p.load(new FileInputStream(file('../core/assets/version.properties'))); return p }['androidBuildCode']?.toInteger() ?: 1
+        Properties props = new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
+        Integer vcode = props['androidBuildCode']?.toInteger() ?: 1
         def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
 
         applicationId "io.anuke.mindustry"
@@ -78,6 +79,9 @@ android{
         
         versionName versionNameResult
         versionCode vcode
+
+        props['androidBuildCode'] = (vcode + 1).toString()
+        props.store(file('../core/assets/version.properties').newWriter(), null)
     }
 
     compileOptions{
diff --git a/core/src/io/anuke/mindustry/entities/units/Statuses.java b/core/src/io/anuke/mindustry/entities/units/Statuses.java
index 8d7a392a5c..05c00c5b44 100644
--- a/core/src/io/anuke/mindustry/entities/units/Statuses.java
+++ b/core/src/io/anuke/mindustry/entities/units/Statuses.java
@@ -28,12 +28,13 @@ public class Statuses implements Saveable{
     private float damageMultiplier;
     private float armorMultiplier;
 
-    public void handleApply(io.anuke.mindustry.entities.type.Unit unit, StatusEffect effect, float duration){
+    public void handleApply(Unit unit, StatusEffect effect, float duration){
         if(effect == StatusEffects.none || unit.isImmune(effect)) return; //don't apply empty or immune effects
 
         if(statuses.size > 0){
             //check for opposite effects
             for(StatusEntry entry : statuses){
+                if(entry.effect == null) continue;
                 //extend effect
                 if(entry.effect == effect){
                     entry.time = Math.max(entry.time, duration);
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java
index 3c904b84f0..b527b98456 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/MinimapDialog.java
@@ -25,7 +25,7 @@ public class MinimapDialog extends FloatingDialog{
     }
 
     void setup(){
-        cont.clearChildren();
+        cont.clear();
 
         cont.table(Tex.pane,t -> {
             t.addRect((x, y, width, height) -> {