From c4b1df9526955bfb7faac3e5e19394b0e99b17ae Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 22 May 2023 14:28:10 -0400
Subject: [PATCH] Closes Anuken/Mindustry-Suggestions/issues/4433

---
 .../sprites/blocks/turrets/hail-heat.png        | Bin 226 -> 279 bytes
 core/assets-raw/sprites/blocks/turrets/hail.png | Bin 463 -> 383 bytes
 .../world/blocks/payloads/PayloadConveyor.java  |   2 ++
 3 files changed, 2 insertions(+)

diff --git a/core/assets-raw/sprites/blocks/turrets/hail-heat.png b/core/assets-raw/sprites/blocks/turrets/hail-heat.png
index ef3805e18e123a952c383abfedf98d90e8034751..84f197b52b582f0efb167530cba4bcd8ec8f1165 100644
GIT binary patch
delta 238
zcmV<K01^M<0ha=hF@MoXL_t(oh3(TjN(4a=fZ?x11Vs%5Bf-GKZ76sEBM%^WJOcy8
z$Onsx3l44>Y{80burn|Q+J9JGkH5QU8vmUbQk0qVmCYhH`u6HwkeMBF^-*@C3S{OK
z9X@|ZWW~D5S)0v1$#}vZcCcl6fjK_#j@K~-?r?|$?3RQY{%3|~Jd7!DjhW>Nwktlv
zBkoIbZF>KL%)G)0j<8?hml}Q(5vQXHl*A>DEmpze>2D+AtZ%PD0wr<rT_7UPhxQsw
oW==A5^6P^ejYgx<Xf*y5UmCGR;`FO(z5oCK07*qoM6N<$g4_aYB>(^b

delta 185
zcmV;q07n0p0^$LXF@Ky%L_t(oh3%3%4#F@HL}w5eNll;oM9MiRI0q7^N}Y~tOqw7W
zD@1E2go1gJ3ro8@&mX}27}hpQy1xw~`@;nC@GTO>0-wTbB~FFmU9x><YpG^Gfrap#
zDv8h&Bm<k^+z|jsJ~j(fgcnJi1A_(tm)C~mb*)&^E$dw+`Z5Ow%qI#mM#6#E4Wtsg
nhKG^VN@~AVZ;Ua<81vsuVo^bYVit#a00000NkvXXu0mjff8k5V

diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png
index aa7a70ac87693fa0a58ec15fd51d2490d854c744..604fb5d5de6733326a259c4569e1691abbb9d396 100644
GIT binary patch
delta 357
zcmV-r0h<2L1OEb$BYyw^b5ch_0Itp)=>Px$IY~r8R9J=Wmaz_kFc5}|lds|KL`+N^
zd<J)%WmYGjz>!&5W!KqBO-xLT6TX1&z+4AYQwzP`U)bcP2Fm>(2lw}cXye}_@OdbS
zBdOM-@!)%X7|r2)ojT%X+_J=auMq%B+!ulkaJuB|#6?lC_kXeg5OEa33E(4+K#%~Y
zcsN}-Mf;N(1Oaye1);>H<QEMFutAvOQc4yG3GmphSrF8l=ld-QV0A9N=c%#}!k$(9
zc}Tx&n@d(!z%(4H5-Nh=H@_|}gx#P@05-QnAWU%z0{RKNucLEMx{Q&Od;oRoQ4rh3
z=V!d0@67_}M_w*BxDZYNA8`Z%HX<si4=e<r#H%_&84e0j0+??y)>x%OxZF-fl^Io5
z0D-6@ZUsOf>WB;BF%_FmX?}BbGKRZ=s*KNA-bNd5WoDCJ{k-=800000NkvXXu0mjf
Dwp5#v

delta 438
zcmV;n0ZIP<0?z}GBYy#WNkl<Zc%1Flv1$TA5C-5qun_JY0_m*|Az+bI>C<biwXw<*
zq`X>fbG@lkX+Q{wmA-)QaFA}}oQ&-4?aj`tF+p%ZPS<t+Pj7dyq5ioVSHMLA(tcOt
z^Ug#2IDXe1MrQ|@;dXsxsg@!{fON1AH{%^qQUn_?|J>;H+kYz=j+N)Rj^mhxU;!YU
zGcN?;1%!l45G243PkJw^xD7B0569B2r@jawJ_QwoBV22(qKLN-gZe-T;RrXcJ_reb
z5C|g?j&QR!vq>1BIP(ldE4i%=-@Z?aE7cpE01Q8@Oe3)1r#2B7j#Y=K07~J32s@lY
zh&Ew!_o2RT9)HO>)6qb6?%U)XIbd(bMJdGO`LG$6ixnH;2N>a!;v&3&kZ=h?+=yV&
zr02c`5C-o{N(5NWSH&%Hod|3=QbYwX9A}a9C|YGAeBBO<)d!@A=8m^VM4eEAI3=6}
zAVQ6^(wGlb39~*g0@R`E5P$Nw91+JCo^N;-z;D(S@Gk>_p3%$y#AQbS000hUSV?A0
gO#mtY000O800000007cclK=n!07*qoM6N<$f|C-w4gdfE

diff --git a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
index a10863bbe4..94a0de3071 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
@@ -250,6 +250,8 @@ public class PayloadConveyor extends Block{
 
         @Override
         public void unitOn(Unit unit){
+            if(!enabled) return;
+
             //calculate derivative of units moved last frame
             float delta = (curInterp - lastInterp) * size * tilesize;
             Tmp.v1.trns(rotdeg(), delta * moveForce).scl(1f / Math.max(unit.mass(), 201f));