From 3435132e87127be9f240226f348a03ea22395121 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 16 Sep 2019 08:38:49 -0400
Subject: [PATCH] Status nullcheck

---
 .../mindustry/entities/units/Statuses.java    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/src/io/anuke/mindustry/entities/units/Statuses.java b/core/src/io/anuke/mindustry/entities/units/Statuses.java
index 05c00c5b44..62bcec4a2f 100644
--- a/core/src/io/anuke/mindustry/entities/units/Statuses.java
+++ b/core/src/io/anuke/mindustry/entities/units/Statuses.java
@@ -1,16 +1,14 @@
 package io.anuke.mindustry.entities.units;
 
-import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.Bits;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.util.Time;
-import io.anuke.arc.util.Tmp;
-import io.anuke.arc.util.pooling.Pools;
-import io.anuke.mindustry.content.StatusEffects;
-import io.anuke.mindustry.entities.traits.Saveable;
-import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.type.ContentType;
-import io.anuke.mindustry.type.StatusEffect;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.graphics.*;
+import io.anuke.arc.util.*;
+import io.anuke.arc.util.pooling.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.entities.traits.*;
+import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.type.*;
 
 import java.io.*;
 
@@ -29,7 +27,7 @@ public class Statuses implements Saveable{
     private float armorMultiplier;
 
     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(effect == StatusEffects.none || effect == null || unit.isImmune(effect)) return; //don't apply empty or immune effects
 
         if(statuses.size > 0){
             //check for opposite effects
@@ -86,6 +84,10 @@ public class Statuses implements Saveable{
         removals.clear();
 
         for(StatusEntry entry : statuses){
+            if(entry.effect == null){
+                removals.add(entry);
+                continue;
+            }
             entry.time = Math.max(entry.time - Time.delta(), 0);
             applied.set(entry.effect.id);