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

Added null check for attribute

Browse Source
This commit is contained in:
Anuken
2020-01-24 13:37:23 -05:00
parent 78fb427120
commit 2fe6a3525b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/world/blocks/production/SolidPump.java
View File

@@ -5,6 +5,7 @@ import arc.graphics.g2d.Draw;
import arc.graphics.g2d.TextureRegion; import arc.graphics.g2d.TextureRegion;
import arc.math.Mathf; import arc.math.Mathf;
import arc.util.*; import arc.util.*;
import arc.util.ArcAnnotate.*;
import mindustry.content.Fx; import mindustry.content.Fx;
import mindustry.content.Liquids; import mindustry.content.Liquids;
import mindustry.entities.Effects; import mindustry.entities.Effects;
@@ -26,7 +27,7 @@ public class SolidPump extends Pump{
public float updateEffectChance = 0.02f; public float updateEffectChance = 0.02f;
public float rotateSpeed = 1f; public float rotateSpeed = 1f;
/** Attribute that is checked when calculating output. */ /** Attribute that is checked when calculating output. */
public Attribute attribute; public @Nullable Attribute attribute;
public SolidPump(String name){ public SolidPump(String name){
super(name); super(name);
@@ -64,8 +65,10 @@ public class SolidPump extends Pump{
stats.remove(BlockStat.output); stats.remove(BlockStat.output);
stats.add(BlockStat.output, result, 60f * pumpAmount, true); stats.add(BlockStat.output, result, 60f * pumpAmount, true);
if(attribute != null){
stats.add(BlockStat.affinities, attribute); stats.add(BlockStat.affinities, attribute);
} }
}
@Override @Override
public void draw(Tile tile){ public void draw(Tile tile){