From dd181a44e3bce185cf635d4337f872270cc0ca84 Mon Sep 17 00:00:00 2001 From: xstabux Date: Thu, 21 Nov 2024 21:42:18 +0200 Subject: [PATCH] fix a javelin crash --- src/omaloon/world/meta/PressureConfig.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/omaloon/world/meta/PressureConfig.java b/src/omaloon/world/meta/PressureConfig.java index 120b9921..5abfa518 100644 --- a/src/omaloon/world/meta/PressureConfig.java +++ b/src/omaloon/world/meta/PressureConfig.java @@ -61,19 +61,22 @@ public void addBars(Block block) { block.addBar("pressure-liquid", (Building entity) -> new Bar( () -> { HasPressure build = (HasPressure)entity; - Liquid current = entity.liquids.current(); - String liquidName = current == null || entity.liquids.get(current) <= 0.001f ? Core.bundle.get("bar.air") : current.localizedName; + Liquid current = entity.liquids != null ? entity.liquids.current() : null; + String liquidName = (current == null || entity.liquids.get(current) <= 0.001f) + ? Core.bundle.get("bar.air") + : current.localizedName; + return Core.bundle.format("bar.pressure-liquid", liquidName, Mathf.round(build.getPressure(), 1), Mathf.round(build.getPressure() > 0 ? build.pressureConfig().maxPressure : build.pressureConfig().minPressure, 1)); }, () -> { - Liquid current = entity.liquids.current(); - return current != null && entity.liquids.get(current) > 0.001f ? current.color : Color.clear; + Liquid current = entity.liquids != null ? entity.liquids.current() : null; + return current != null && entity.liquids.get(current) > 0.001f ? current.color : Color.lightGray; }, () -> { - Liquid current = entity.liquids.current(); + Liquid current = entity.liquids != null ? entity.liquids.current() : null; return current != null ? entity.liquids.get(current) / block.liquidCapacity : 0f; } ));