From 16fb70b0ef39b3ebdcf89f4e4df0f279ba94bb77 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 14 Aug 2021 09:21:02 -0400 Subject: [PATCH] Fixed #5762 / Fixed #5763 --- core/src/mindustry/input/InputHandler.java | 2 +- core/src/mindustry/ui/dialogs/PlanetDialog.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 0b5f2bef99..fdaa0e335e 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -462,7 +462,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ player.unit().updateBuilding(isBuilding); } - if(player.shooting && !wasShooting && player.unit().hasWeapons() && state.rules.unitAmmo && player.unit().ammo <= 0){ + if(player.shooting && !wasShooting && player.unit().hasWeapons() && state.rules.unitAmmo && !player.team().rules().infiniteAmmo && player.unit().ammo <= 0){ player.unit().type.weapons.first().noAmmoSound.at(player.unit()); } diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index c0cf02795d..d53c607598 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -63,7 +63,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ public boolean showed = false, sectorsShown; public String searchText = ""; - public Table sectorTop = new Table(), notifs; + public Table sectorTop = new Table(), notifs = new Table(); public Label hoverLabel = new Label(""); public PlanetDialog(){ @@ -559,6 +559,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } void rebuildList(){ + if(notifs == null) return; + notifs.clear(); var all = planets.planet.sectors.select(Sector::hasBase);