diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java index 8b35ac83d8..50f62e3255 100644 --- a/core/src/mindustry/entities/comp/PlayerComp.java +++ b/core/src/mindustry/entities/comp/PlayerComp.java @@ -71,6 +71,10 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra return unit.icon(); } + public boolean displayAmmo(){ + return unit instanceof BlockUnitc || state.rules.unitAmmo; + } + public void reset(){ team = state.rules.defaultTeam; admin = typing = false; diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index d93e668db2..00c6811392 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -714,8 +714,8 @@ public class HudFragment extends Fragment{ t.add(new Bar(() -> player.unit().healthf(), true)).width(bw).growY().padRight(pad); t.image(() -> player.icon()).scaling(Scaling.bounded).grow(); - t.add(new Bar(() -> player.dead() ? 0f : state.rules.unitAmmo ? player.unit().ammof() : player.unit().healthf(), false)).width(bw).growY().padLeft(pad).update(b -> { - b.color.set(state.rules.unitAmmo ? Pal.ammo : Pal.health); + t.add(new Bar(() -> player.dead() ? 0f : player.displayAmmo() ? player.unit().ammof() : player.unit().healthf(), false)).width(bw).growY().padLeft(pad).update(b -> { + b.color.set(player.displayAmmo() ? Pal.ammo : Pal.health); }); })).size(120f, 80).padRight(4); diff --git a/gradle.properties b/gradle.properties index 2a3be1ea4f..321a9d4491 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=51e2cc4cdbb7868b315ed9187f2475a4870be3fd +archash=f47e6ce55af4da9be1dd4061aa80bf9c681735fa