Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Status nullcheck

Browse Source
This commit is contained in:
Anuken
2019-09-16 08:38:49 -04:00
parent d49b15b2a0
commit 3435132e87
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/units/Statuses.java
+13 -11
View File
@@ -1,16 +1,14 @@
package io.anuke.mindustry.entities.units; package io.anuke.mindustry.entities.units;
import io.anuke.arc.collection.Array;
import io.anuke.arc.collection.Bits; import io.anuke.arc.collection.Bits;
import io.anuke.arc.graphics.Color; import io.anuke.arc.collection.*;
import io.anuke.arc.util.Time; import io.anuke.arc.graphics.*;
import io.anuke.arc.util.Tmp; import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.Pools; import io.anuke.arc.util.pooling.*;
import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.*;
import io.anuke.mindustry.entities.traits.Saveable; import io.anuke.mindustry.entities.traits.*;
import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.type.*;
import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.*;
import io.anuke.mindustry.type.StatusEffect;
import java.io.*; import java.io.*;
@@ -29,7 +27,7 @@ public class Statuses implements Saveable{
private float armorMultiplier; private float armorMultiplier;
public void handleApply(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(effect == StatusEffects.none || effect == null || unit.isImmune(effect)) return; //don't apply empty or immune effects
if(statuses.size > 0){ if(statuses.size > 0){
//check for opposite effects //check for opposite effects
@@ -86,6 +84,10 @@ public class Statuses implements Saveable{
removals.clear(); removals.clear();
for(StatusEntry entry : statuses){ for(StatusEntry entry : statuses){
if(entry.effect == null){
removals.add(entry);
continue;
}
entry.time = Math.max(entry.time - Time.delta(), 0); entry.time = Math.max(entry.time - Time.delta(), 0);
applied.set(entry.effect.id); applied.set(entry.effect.id);