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
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$h)G02RA_<imoZPmP!xp^#KG+?gcx0zh%-auNEliC0sIKpj{XG7_;z<$9E>rH
z#=*%L!%~(KLs;JCV(J7D;XQcmy|0?wZ!3MdJtw`VIRJtn2to;Jl*4ZCC%NnX`^(e%
zd2t+*JhM(Rr9y%kc)Xji%nf3IOFR(30H=6>*#NhAKtk-M*Y9$U2N2*5aGMCSLYyXo
zWuVvZ;=FS~KKF=xqMLmF@kv@=NDW*rZ#J&4p3in2%R$(|yjDnS?KM1!GTSX@>GQ!m
z16pe@BMuWJ6kZ{%HI!1DKYl&zJex$BZJkOJEW}BaVcZz3uSY|gxl$#n#%qO|t+xBX
zvW%2s_-3Hg=Z~XaldjOukcNUh12z*}pHY?&|2DxT9`MY-Vm7TcTkV5#Fm4R~=3mOi
zY<f@;bBRAaIj*M6t=MNGlz6~%g_Ke-#sILdlS}+)cuguEDA0vg1<n|=^(J25=GJ_0
zhz9~y2`=$K2?JYI+5)F|z;lJtH1!(JEnW}=K@k2u-zTAIqXFAsPXGV_07*qoM6N<$
Ef`aABd;kCd

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
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$#z{m$RA_<in6XO3Kpe)u7N;&*9UL4wNESg59E*d4gZLB~C6CZY5XXB8rw#>6
zm(p3#x;QvEI7M6p5gG@3F&CS7m-{ZMa6brb?vBg%-QEB0p8y_@=U>xdb#xIA0U(w4
z$EO3OelnUW&%L@FQl8tT^zu#mcavIeD`6VQD2{$v83Ve3Dxoe+Y_U2D!#)7u<>?s!
zu)VvZ)XQ?&j)jvY)Fj?O+t6ZQv3LYf9;h-V3g>|}^ckoU$QBP67!X202%*(>olqCz
zff_SlVx$b_R$4m-gb)aVAiJN<AC&sD4|T*RtKW@12Xut7#RKFZt`g`%JYZnp?)Fft
zohzYbXd4Lk@3BM=OY~BCy}o^Bm(q5P33*PiF<nAddAth~CI)JYk8ghdvrRb9h4SJh
zOcU0*P%-b9#3MIrzKGQfl!<SWw$f?Z*AOcM@-@*Ans|T^1BNE3;(=zD5M4ZAX26L6
zTTExb#suwaTpsNh=;9qok^n0cdk06q1Zl)W3i3=+V<3MnRAi;pnV<)8(<YqkLYgKh
zXvaVlMa81d^?0f^l4022nD+sN^OHgATdVaFYTE=Q2HG~^@pwF*+I#^(^LSj{h(uTb
O0000<MNUMnLSTaVn%$BB

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);