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

Headless cleanup

Browse Source
This commit is contained in:
Anuken
2020-10-26 11:52:33 -04:00
parent f814fa861c
commit db5298e40c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ctype/UnlockableContent.java
View File

@@ -123,7 +123,7 @@ public abstract class UnlockableContent extends MappableContent{
}
public boolean unlocked(){
if(net.client()) return state.rules.researched.contains(name);
if(net != null && net.client()) return state.rules.researched.contains(name);
return unlocked || alwaysUnlocked;
}

2
core/src/mindustry/type/weather/ParticleWeather.java
View File

@@ -34,7 +34,7 @@ public class ParticleWeather extends Weather{
//load noise texture
//TODO mod support
if(drawNoise){
if(drawNoise && Core.assets != null){
Core.assets.load("sprites/" + noisePath + ".png", Texture.class);
}
}

2
core/src/mindustry/world/Block.java
View File

@@ -356,7 +356,7 @@ public class Block extends UnlockableContent{
current = entity -> entity.liquids == null ? Liquids.water : entity.liquids.current();
}
bars.add("liquid", entity -> new Bar(() -> entity.liquids.get(current.get(entity)) <= 0.001f ? Core.bundle.get("bar.liquid") : current.get(entity).localizedName,
() -> current.get(entity).barColor(), () -> entity.liquids.get(current.get(entity)) / liquidCapacity));
() -> current.get(entity).barColor(), () -> entity == null || entity.liquids == null ? 0f : entity.liquids.get(current.get(entity)) / liquidCapacity));
}
if(hasPower && consumes.hasPower()){