From cc689fd1148a82b909ba63e0d56bb81ad7b16914 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 29 Aug 2021 10:26:39 -0400
Subject: [PATCH] Fixed #5895

---
 core/assets-raw/sprites/units/weapons/flakgun.png | Bin 462 -> 0 bytes
 .../assets-raw/sprites/units/weapons/missiles.png | Bin 524 -> 0 bytes
 .../world/blocks/defense/turrets/LaserTurret.java |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 core/assets-raw/sprites/units/weapons/flakgun.png
 delete mode 100644 core/assets-raw/sprites/units/weapons/missiles.png

diff --git a/core/assets-raw/sprites/units/weapons/flakgun.png b/core/assets-raw/sprites/units/weapons/flakgun.png
deleted file mode 100644
index 12ee89862fcc25425d9e07046032472aad62d1de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIjKx9jP7LeL$-HD>VC?X8
zaSX|5d^_FH|4@KPEB}#$Z*^NFVrO(1J3sc2i2TF&hvRzRKbBKJ%E}{UdJKDx9Xu&<
zIB1%XbHu%8Nv~K0AKF&D-MfC)oqX-uown+Gms>J4DR4M(W=%Pq_g;PH>wmvbU;b5D
zC^Ok+v!BsYrzXjYJ+n8Q;Z17rwh=hMu)Lz-Cd2j$2d6j7uD>tpV;6Y9TQHkrlhYiv
zrql)3-#^+@>}dDBqh`_UntvZXqvAbyWAyUP)~%m+zD)MC<BfxR!aTCyn%Z<4-PTQi
z`T3wVb5ypzGM})DNSxwY(<wo-?dxpc*vxjBnLF1@Sm%i6l*Bs{Yu39v&)ONJy6RYV
z>#VigejnJ>GbQOq+JY<3`xnPeUU%XAgtjIdW;5ZK`GL~}{+k_CmHTk!K$6*7)9AO&
zMFx31|DMI4I+{}zAXwaKZ)>@3*_pLB(v_xE94Ky`5@c|UVZ-{#-hVPGe6{2>F0_WR
zo|D-8RW0uRvuia49qde@oO&M}IGLkEZ!s+g>9}O_RqC8>oB)fXz(3pj>I*X$Gu}?{
RXJBAp@O1TaS?83{1OS5N%6tF-

diff --git a/core/assets-raw/sprites/units/weapons/missiles.png b/core/assets-raw/sprites/units/weapons/missiles.png
deleted file mode 100644
index 38c0548ca637739cbf1e28a5979969274d95dec3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 524
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIjKx9jP7LeL$-HD>U_9pO
z;uw<A_;$udufq;9$M%aY*Nc>uk+Jd+a}<#2Zf<V=AtI^Tf5Bbgcs18@K34DPmm)9h
zvaqnQaE)ORlwz+o6rWu&{kPuA0(*|!cYUY7-@W_)-FybQ{^#+R6H7}3`56_aem}mP
zd1;-|EUoi<cgY0JyS?<wC*NP?lcRFA6QxdQ^wmX5GVf~CTBzrfv(bv{upPsLr!OTL
zHtgNK_{!;`n|-a5Rj;VrbGUsWDPdy;OMu)8BQ>t)jiz5DR|uUD<Cl;SaB|>Sc(rV9
zfcT?EDdU8sB|Oi<qO93k1UQ-$cF#X6KjqhE{?a4rtMB*PvX``MJj(n;VV%$mC!2(X
z2k*WGte&gAFf~J(<NN!KF8tnKf-3j!t4*7JsjQc?(r<%dtW#L!9&TYZwyf^{{JMXe
zeJ#$netM+pBYbUVfZ_Y;N0iO8_jO$5nbMg*Y1^gDTh|4&nLn9c6qr@fAi&(Fw&GD^
z+H`?fn}oCjoea@F=?9Lnyv>f0dn@tck*wz=25sSLcK7`(nMa(tKKTSCE7a?Sq%6HM
za{+tdWwkkPoMx$MWE^)8aXq@|+}Da#rjrtH+@JBCvGwz0$Jf!TzY1mDW>ICkW%lr6
fh0VNMHH;3QD`M_;xI{28Ffe$!`njxgN@xNA`I_C5

diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
index 299b457388..0d0a912a5e 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
@@ -90,7 +90,7 @@ public class LaserTurret extends PowerTurret{
                 return;
             }
 
-            if(reload <= 0 && (consValid() || cheating())){
+            if(reload <= 0 && (consValid() || cheating()) && !charging){
                 BulletType type = peekAmmo();
 
                 shoot(type);