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

Fixed #10461

Browse Source
This commit is contained in:
Anuken
2025-02-03 20:14:59 -05:00
parent 8a49935bd6
commit 024a084a7a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -559,14 +559,14 @@ public class Turret extends ReloadTurret{
/** @return whether the turret has ammo. */ /** @return whether the turret has ammo. */
public boolean hasAmmo(){ 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 //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){ if(ammo.size >= 2 && ammo.peek().amount < ammoPerShot && ammo.get(ammo.size - 2).amount >= ammoPerShot){
ammo.swap(ammo.size - 1, ammo.size - 2); 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()); return ammo.size > 0 && (ammo.peek().amount >= ammoPerShot || cheating());
} }