From 1a9fe45e8ef5833c4e9cd41186d80fdcdab0c79f Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Feb 2022 22:19:27 -0500 Subject: [PATCH] Fixed duct bridging --- .../payload/payload-mass-driver-cap.png | Bin 863 -> 887 bytes .../blocks/payload/payload-mass-driver.png | Bin 1332 -> 1355 bytes core/src/mindustry/input/Placement.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-cap.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-cap.png index c395763df7db0e9fca4253a32e8ff95fed60d29c..a9941a40e8010af19d6712a3d6df7bedc60fee16 100644 GIT binary patch delta 819 zcmV-31I+y22KNS#F-I{;L_t(|ob8&uaoa!;h1VW8puinS30(nuaZEYVs05baaU?NT zFX{k^*nt9A^>-#d2;O*f(-0uCr43U8yk&p?0E|o89cc7Ms!_&#k zY#5GaX7=az{zKl&SMLCK_xqE&%^?07an!gP5JXXmGbf5i9B&ic3>b@{5GO|rk2szt zxEPQUp+%e$5j^5}nb1_Y?(X-e-PP;a_lLjVXaBd^T(^XMM<~Jymil$OeL4H?@%hGn z?S5A4SUm!2pE9L?_-bm+Y#AL@23&&p!*H}=IND}&eGwz7)`aF7u#|2B-Xg7G!sGKz zb1X>_&M`ritLNHLnUK?tLVPpfEU1SGIsb1pp{Mv}X5VBj*_#Pdv!a-gx8u)hN=%63 z_ZHvGVI5F15{khcjX?R%S`Y+qUfyiBNR*UJQTyV6;Z*?CP!9hBs*rdv!c$}i6F0VU_NQ`dUb zk|`5Pg!M9iq1$HM|A=B?CMm)>TM%l3@tfzjMO3f(f8e4w<2>F_NW}_xY!k%9vms?H zX$?@BFqhWmew!1fMKmw*&73#ma!g2FGbMCRy_pgyC0foYmZ$h;l?If|a^_4}GAI_j zq}azoEr~W~Ldh{>?JTMJt%%%f$EK<3gz6M*EMO0R@y!J9hI$v=CDwk+qIG@HTmwGp zOR)+Ri!(_P{){H5R>o4{Qt2q93Dpr~%5c@|gQ1_P^rqaFkUzO&6UH~uYQoZJYc*lq zzj6Q7dqOU$BbbnSf@)33O?9;(&4O002ovPDHLkV1hoon2P`a delta 795 zcmV+$1LXYo2HysdF-I9mL_t(|ob8*vaT_rZh1VW8;J_V72|G|PjwMGLmB11_jwHtF zMIBrscHqDz(18Xsr_&v70qnz(n(xcVA+f-Fhrh+a43U8yk&p?0&Xq4)SD=>1!}H0^ zY#5GaX7=az{vzA*RUP2|VSkD)Gl{=NoM@y5BvB&8$%&$fqc%Ziz*LL~aXexu;wVj! z7_cNli#R1BDB`G0Xqve0ANHr)?|(mhfB5$!`@h}pswM0@(j*+gTD|UWUO#;I^m1*# zZhuzmSlt6^pR!1Q@uR6Vv!!=b8E_8b55v)h;b^?^^lAfRtzmz2U7UG))7_j!lFHtLgF5cWa-9znvuvHsxOh^x?H9-+4LKF{C zal(cmwFxEVt4)Y3KXeXInNU-%%7o~0Lsvm&Z(@xn;-!NU?{2!q)VrHk_r$rB&l&G< z6{bqh19GQSo)fHy9_0}&mrQF(w0V#j;1M|Yo5?$#aUO6yL1UfRa^CPGE)ji3k%)ju~rLN!2}|)dZ#Zi53%jh;J6~Zm43cPx}Cm z_?}d9+5;$tkkIxt6CjJY|g^OQ!YJ!b8PjVQPj>j^yytPA&C@q1i94f zqFx_N^;|MHGA$84d`wN4Hlo#pwIQ$7glYYz^^eX8NyhJF!qO8|Yl3&asWoA#Ua1|5 zgq$qRx+X%Y38j;LsR?WKQ7ty4hYe9C)HdF0!dBv&iBH5Lx@=41w~p_j%f+_2C(-lt zM>XC?(-Y?E)8pb_x0{7y5qgS07k`Oyy?Wic?0U8H@$h`wLi}<3wciZG@nWyM0sz2e Z@gF33vN}0zK5qa3002ovPDHLkV1oAWg+u@V diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver.png index f8a1dee44427f392533aad58374899f217371de9..f836105245ab2894beca1260c1165357ecf753af 100644 GIT binary patch delta 1324 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 LNkvXXu0mjf2U1YT diff --git a/core/src/mindustry/input/Placement.java b/core/src/mindustry/input/Placement.java index 491b57e9ad..4e6330a87a 100644 --- a/core/src/mindustry/input/Placement.java +++ b/core/src/mindustry/input/Placement.java @@ -212,7 +212,7 @@ public class Placement{ } i = j; continue outer; - }else if(other.placeable(team)){ + }else if(placeable.get(other)){ //found a link, assign bridges cur.block = bridge; other.block = bridge;