From 93cfa243bc170ce9c6d1e452ee106edcabe17828 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 15 Jan 2022 23:08:54 -0500
Subject: [PATCH] Fixed certain turrets working without ammo

---
 .../sprites/units/weapons/quell-missile.png     | Bin 426 -> 502 bytes
 .../world/blocks/defense/turrets/Turret.java    |   2 ++
 2 files changed, 2 insertions(+)

diff --git a/core/assets-raw/sprites/units/weapons/quell-missile.png b/core/assets-raw/sprites/units/weapons/quell-missile.png
index aff26f83e98afc68a3ad0fc29de9cc911b236897..6aadf02c8a51708130f99ecee95bd394f057a871 100644
GIT binary patch
delta 463
zcmV;=0Wkim1NH-uF@La0L_t(&f$f*EN&`U@MW13}D_9CP5g}mfM<jN^LP=v2{3J<Z
z6SPXFeuS-%#x#PZV4E&hvuuW)d2jB!Ar^CBA-l7C=bhb|-HAx0QmOn$_O=oFFrBSa
zZTFKgy-#{zP9VS**=L4L#*eB%$$3_25~YPPMJN(zK`arsgnzdXhKNf-o5YL7ve`U2
z8nA>#Ah%zdmjjYWb$D}mD<bKF!|`yQHCKc7cG3g_ng{|#0xgIo;+Du2((m`04Y}Tm
zOX7TWootH>&xz!6EWi>a0@`scPXm%b1T5{S2z3FtD<FyI_a}B8u3Y#@uthw1uHnQI
z@#Y**sz}iOdVgyZ-UIX`rn5Ws?`7!%(3;x?Je+bJY74;9JPp^J=<3+I0Mv3yaDOMf
zlaldra7he?qjj#3<>yDUbrG%$IViA1+;J=t7as4&=X*q;vDohL<mhUn?eO?3dFMq$
zdS@51`Z?V=_Wk?P{C<0#7uQ5zJLLo{?Fep(_Fde?^++P5CxI5i5D*~_r_zF00wUzK
zll`MLcfVHKz+cL^2;{B8$Z#_lj@I5g%E+ixDwWFC_yfz4)uFc^x(fgR002ovPDHLk
FV1h|^-**52

delta 386
zcmV-|0e$}V1F8d%F@I!9L_t(&f$f(&YQsPjMPGuK5-?~1*@=r7HEBea6x^f{$zIYL
z)L08~=Tswt@XY(%8|=V4ph6ny%{`XpW053Dl6&OgFN(e&#!Id3ZRqKJ(hIf(3T%-_
zX0f6FPz5~qS)oaIgE2)Y645{`5m*8Z!VrNZv_U*g^Ku|{G=IVp7J=5ew_b~oM6JV@
z=e>y31DEUNK5JbK+U%qW6f}_t6p3gcmIy4-3et5?%Mp3r3M8>T@2YL<;4P6>9SdOz
zkAQYvtEUl?hzMBPqaxG|;H?Nre0_hib3k>&Z-Om?)Pp`JmIzvBLrGEL_v)<;c!bcK
zIE=6A-%IZX(0f|<8sX2W)uFZl^w!gW#>BObts6kCjt6+1KnEpba-b}BwIK89xE!A6
zywFzcb)a?d^*M8$p>8`$u-Y$QuCo_P`rfG~U~P{8OQ16g`n(9~O+<q*1Vo6RlQ$4c
gAW4!WNs|A<58VK<32xTG)&Kwi07*qoM6N<$f@k)##{d8T

diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 6c83242c32..1cfa970481 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -465,6 +465,8 @@ public class Turret extends ReloadTurret{
 
         /** @return  whether the turret has ammo. */
         public boolean hasAmmo(){
+            if(!cons.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){
                 totalAmmo -= ammo.pop().amount;