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
zcmaFFIGt&NVf{r<7srr@*0-0fy;vLt8Xm59VR7YUQ9gL!aIQuLgEGHDg$*<F(G%?5
zUEF+mk~s&vayA$nu-&SUi0$9MJ45RKT#2A5Ge1u~t7P`;+pE|KGi8gu29_=6N_i$C
zYgg})a&*_J$k}J@PF5U}E8CD-*=T9^q3^mO>$`#u<~P$?r2eJ1rQ7sq7WB@1%C$|~
z?y&MZ@1oqQ|4nE19OCTT5dUzxRGqNk^2J<Jj;QwOh8=wLGGF=8n*8;SOsa(+V-=Ln
vwSSZHN%J!*{`9(8y4P*-#SD{wBJoliT_1f}owbjFfq}u()z4*}Q$iB}+yZMQ

delta 185
zcmbQv^oVhSVf`FW7srr@*0+<a`3@NfxTFh+d-~4*?Q+Ue!-8FCx!2sjY@b;QlG-lW
z>Mc!`leoQiTc4Ld@JHgBnb)rUyh^_hvwZrXD|D1;{-JDDzt)Gbn`+atSEkuFwtkqS
z)p<c!g?aXaJAw=zc4pimE#jVYn48%creAM+Qo1(clJ4tR)n7*JY-iNDjNA@2-r!v#
rw7ac+;uWu~{h|3ihQ}m6-}gxhbZklzYp-NrU|{fc^>bP0l+XkKf8k5V

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
zcmX@l{GVxpay<iMage(c!@6@aFBupZEj?WvLn2z=PTR=WWFXMiJ$e1ZcP>6YGBs@F
zb5g_9=O36D8JT+hrl+ruPml1vhW7_z*n@+)_uh-Y@njj>slW2<-@mtHJif2|p;Dt$
zdF8dmA0JfLN}PRIGuP@-+MP{Ds@4lKc-;|i;w{+q<joP+zzyH)H!%nliX7s6pxoy$
zfniyNMXaUk@5z!ZjOC213y&;)BF@XU!Ewf;ATKcv&JQ=%MhaY+{rtBsXF{po-sdYf
z@gJHO`lr%kfA(zeu&@IrGOL8NnjV<%*VAjcyTFUVY`e39Pazl6FV5ZT7Z>~Q>X|sD
zhN1LTpup{;&(rtJdw-Vcg?pTy`3?a;2Kho3CNm|imHav^3y!R|a+2iZ3S^p*Z*(nU
zsq>CIey&p`L&F#vS19MPIw-vA;C^T*I@>R^uDHagZFj?}p7Rm++@$kU(<aCL-SeFR
O1Uy~+T-G@yGywp%RGX3j

delta 438
zcmey*be?&Fay?^>r;B4q#hka-HfAw73a~w}-5~Hzmg(hMKE;HIAulgyuid)wl<<;0
zQMtu?R|aP~aCA)F*YLhzLf+#!J#XH=J$r7Ap<{uA-}Tb}{`ut_7XI5Q6@I{#=~7+z
z<Im@ue_PaDmvu{LpYgD)Hg)ARC6|Vh4gBVhWdnm)qz(SxdGYmjy|!fE)aN_<9?xh^
zU{si6tk3e0wWY;dK;;0Rf0h2K9lQoy{Kqe?UA~V)(T-KLML8yW?V^tD{LQ}{I3IGD
zueamiY!Kj37VIn7Y_{1`Vu8hH9vAJMYkBYQ^Y7NaDm{mR$9|2E@`eY?%>*U-Lfcm`
zcs*?7u%6@8VU}3@ec`@*x%!iqmoGY$zPtTI#xf!Qn5*WICqFkxPVW|#e#kEIaMB~C
zJq;5IIGyfvBwSqbd>^X-+k0;>mWXrVM|BJ5a^zS9xv(0@q)+^;5tXV`bC<9CD*KX-
zXMNk<UFHTfS*XroQE=+rd}#)MDCcH7eWoi5UkTKI+Abq_Tzp=Bh1h}oYoZ_YnH%R_
qJpKPjsyhP%17B){XPU1sgBAk=0|x^HTne5HVtBgxxvX<aXaWF}61)xo

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