From 024a084a7a5907afce39b9f0dbf49ea60a22ec57 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 3 Feb 2025 20:14:59 -0500 Subject: [PATCH] Fixed #10461 --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index e56be0378a..617a9c3752 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -559,14 +559,14 @@ public class Turret extends ReloadTurret{ /** @return whether the turret has ammo. */ public boolean hasAmmo(){ - //used for "side-ammo" like gas in some turrets - if(!canConsume()) return false; - //skip first entry if it has less than the required amount of ammo if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot && ammo.get(ammo.size - 2).amount >= ammoPerShot){ ammo.swap(ammo.size - 1, ammo.size - 2); } + //used for "side-ammo" like gas in some turrets + if(!canConsume()) return false; + return ammo.size > 0 && (ammo.peek().amount >= ammoPerShot || cheating()); }