From 392dcf3092dbeda4a831075b425e0d35bc0c3373 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 13 Apr 2019 17:32:49 -0400 Subject: [PATCH] Made frozen forest less constricted / Tree block fix / Server crash fix --- core/assets/maps/frozenForest.mmap | Bin 8440 -> 8654 bytes .../mindustry/world/blocks/TreeBlock.java | 3 +++ .../anuke/mindustry/server/ServerControl.java | 8 ++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap index 39ec3bb9ee0018334a4822eef7a453954426708c..06354bf306c963e1b937cd05a238b142d1013402 100644 GIT binary patch delta 8246 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 delta 8030 zcmV-kAEDsRL-;|k-~oT@mfO~KKDdJb$r)NLK!Ib){`qpP=nC^cDJ}t1s4mXCDBA84|z&0S*BUmNqrOxu5;* zz0du?WNe?A$K%OlFlG8^(Cf3t*rf!+}UD!GC1muM&nnkF`JC1 zgQLl~&-7XEywBRtc)X+I@!4d&z`H$pHSHn0fx`ZaX}uvzH|b61$ZyhndCtsdi{YsM zb^q^U|L+t3?^A#O@4Nor_gJGp7))OF=BTA1{%G?ao@ev%`G8rd1Keh)<|$kqUZNur zOq8y1Iv$NhSOYu(Yv4YbGkbVEIGUZ0U*etrui+i+91Wj8pD|-PKK{*&!ic8^592@f z7w4fXauAP>&y^wa(dqxamz@1a^XXu4)aU3p7Y?i?f**g67Bi~Y?6fx;AQApYB-oM9M`@XTeK@UMN&+H2en?Fz|7RjgWub(TMF|JRgmE&^++w!sT=Uhl7a2 z$?&9iK8Kpx^V6x2Cs#lvlIuiX{PbD@J|e`yrB^>p(??ANxfOl$LpVMLROXB4z*iUz zzeeG+@2mH@*gE`w-=%#vfa*@B<6jSsIZF@5;Bm z&x?P-E4X&T3WZMguNUXX^C9fq9&B3wWN_it7G)3LO$Zq0qB$Keh@1W4Y(5=6Tks59 zyjW10mq#bCG7w>ylp`u8N_RGZ6*?atL$4-_vk7yjW7w)!;sp#HOwR%@3)%G-!#Qg~ zrbO=I)t8GPZ~qn5`3>9iU&5-iFRJ3F71V!(UVW)NANL0UD17!A?pyUacW2hK-W>V8 zVlDr{4|E$k_Y6XX+>TBLfw*^qszjX@(`P^-;&j-DF&#_?5Y9_MThsYT}a;n@UF;ro7s?LY$Zwl_H+EY6_i$G(FL1AyB5FTx!7L8*VS zI2wF5pNiC4Kv1iL*vqCd-VLAw{kt=f0G=}7ssQ)0i8in5I#TZgJ zoJ>Z%rF(Te;?0=;d@;l8Yyu6KLh66H{pyd=vbJZF;dD4htIbRP3S0nJ=Hs)_q5X2& z8_rL|_twcNnwRi(e>!+EI7gI=2>ss43Ahuc2&?mQ6mbxSwv)1G5w62&3uehBhwD35`52B9G6S(F{?zNM_89WTZ1a=%DDc zQSXFl5F`jg&=i@h4a-6ZF;noBdM})x%pg88JK!I)2Ghlav;(3&o*nh3)7~rQKxO)n zbM9dZFwv{wATrAbo7n-1=oEhrQ56$v0`uQs7IRLfTy}qfF2+U2srh_5{_WuW2ax0$ zEXZ^*JRdJ+KRe~`Fx(``{ZA2(KOuO3z*TfU`04QZoV7{zd()55GLHtI9Wqu^O*Pe2 zQ%yD1R8vhg)l^eWHPuv8O*Pe2Q%yD1R8vhg)wD5cY`Xw8Rgts~Q}BP#VcH=*l#pU_#+hLI%fmnab7*`>Dja}4kBS+k@{|{Xj%{tpgvyPURH@k$dPS5M%yPj;6 zll)Qqx+IVdF}-G)=O9w<=#nu4)XrA;hmD5ILjsP}qL~mAVI7x#942gv6$`?I{Z_Y&bfP^z8loI9#+44uVD}P*7h+ROXot zfev4U>axA9mNV@A0va{@xJmEER!}8qn$-b?`D2iW3Te%DaS?@4gTZVjm01ajXjYVt z&>Bv{R%;c32Gm#uN~egFRk9v&Og2|_pAe;SnUjsuGZ24dcR9!I@6l$4%(B1nLhwIVC^LiiJEq!eU-OktL#TSj>j zQ!cWBgAD^Yw_KJ18WyNYo?P56>u#X%3e8eVa#+kFvT`G$cBSTR)O?6EX@IarI8@pn zRgz6{d4OO!w8JG+-`M~YAaZ3*AnmW&uJ8HVu|g zDKdWnAr`o^0kSt@-T%L~TtQvA=XTDGby{w85RwvUzPDynT{MXa?&jMIo5_?h~zG}8? z(~K+&>){G`nMZkQmPJ4r$&d0pp&b!x9~OTtP)6HLJNxKQx%Ta&*T8Bf*AR;%A*sD_ zu~KOTTkjNFxoc&wLM5i$vl^3BsTLxgaIiwBd2B1#O{dV1xy+jzizOwCVC!j8O`8%Q zC-)X~n%=(xak#UTMW#1}RWEJBS1bydX5muJ3vG;foZ5ws+Z3loHqfqI@KuAjTW5dW zrYX+yuV7jlD6}8m*N!+)^u#%hC@yjOCD1Vnn%6BktyCOk)#yn}Y+3Y(;fg&&k=E9z z( `^9{i$szFL{=4b^26FF?qajoS2sD)#6Ltwh1M`Gi&vc#ph?wL6Hs!5#9Ojbh{ z^aPSMab;l=RvUMTgfZtnHe1;-)}-f-HirvaW#x8^qR@l`e6fG`CXTDJ zr%IQs4KTH-`;k0)jWbh9m9bdKG)1(<#C$v8{3cHAsliE7XrC2yFcNZ!9UWH<0zH2H z_Y(7kQChX=Qxx+Xe3rnsehDL#IQCYH^VBJQq|?6B(7f1GLHYeflB5OfRfF3S5?1JB zcFk>_dy*UuZ$~sD-5$Yead>~c9jR>A0}DcEo58_nHF4!Am9bTkUL`ny3Epbr{*VZ7 z8L6G#Q7~q7nNm*Ii zO1r{ZrXwN0qhO1q2K=;Q_}L2hnRVBV8f<`fC60kecFd|GsNkv@SDk-Vd{zRvRRTU| zWipfAlqI>MlsX+(22z8~7;%#lO2BO^Fbbj?`QooAmt4Zp$v%mcbJKfi$!GFX zP1Tq-NdCG!A?*p{i*A2*%TSeOaSaq!3gq&-+se^Fa<4-R0F`0yt+j@nRT;As1s9(POg1~GtV_jyVv4ts}>Z5V_cM# zYY_6;R>8}Yb>+ohmRG3Alo?*SFA%N8p(e(j!x?Z*{(w1TUq5w z)AD9!83g4wKj*w;^~y|pNU7_jnaWvmT5h?LG0IeZ(KpD`!CQ$@cp>$TrgqvjxjUWW;x=K>f-hwxmnYNNlakYN zUF7fgh~q#w;j@3eA|tS*j}|2>*&#>9~$GE7S-s3BBJ0 z-qOYRkJTFqkdl$xTI6ongx=0Fhnd7DbQ2mfu^}fVmt6$N->Q*uflQ5j+#wT8;cm$_ z&fo#TJHIm7mlEh^Q^3`TtNr~xu1a`AE|1DLegvctk7(kXqvw7hl_FY)n(tk(!< zy|W^`8&EcjuK$1fwqfa-?vi;7D`iJc_H7P9@sU}X4RX=472e;@vshnF3fn2RwBWMF zUcpQ|NyOLOqq$=}mJk9KX~kA-eaybtok@RHlMiHF4+=YvtP;Q6wrPA>#;MxE z8@`=vNyQ9C%8fT`ZBx0P{oX}=eIQ!d9cyY?uws%r37NGk6~?-TYupM4dM9l)lg66m zfV-#C~l2L1A znmZ!1RtT?z>0bW&!>%6Ej8-sdlWpY77n1V>s>D|*<;y0RZ(Y7QeCKr}4it^9O%RtS zu;p#-iQNw&+xg3u{FN?^RMOmafD(qQVkv)6jag%g!zkRFlyjmc)m~YFq1$bMk}*<( zg`~K+(Su#$!{0gQ&?LWYX9YckoxGnx9-#0ht~e3Z0x=H1zMZF~UgPt%T0!Qt6D)|ZvH`eZ$-pML`1zQIq)F;O2!J9f-@HFbSVS56&>TZ?5rrLo4MK$OobmvV%Au^s-M zTsQZrdzr{FZcnTd?1GlrfSsRdaT9-2V!3?1W4|j&e(JkQ)QzFU89zzIDQfHBm1_q? z!IG~X&YJ#CAsdJ3lJb^tGl_4RBZ#kei^6j8b_C)yWTRCsa2rE`0^@h6R;|_M-$te6 z=q;3m1q83snyP5!;mUiFNdccW~IE%{x+SR>M zJ2y=7NU8BNu@@iYl9^77V3dE_iiI#~m-{dms}IS;ZAsb|WSc}S6)%~uUCVDc6i7Ld z?Q>VbDg>$Pgsjj^6Yxq!D)lSXS}+QbG?n68kOC}yIjLfi+B9C9$ZJ)POXfU_&;lb( zv%-DRlI;#%7W7cudzNqjHspZ1HXpVQUlD0853yzTJE0?I#cz;{@>zeAo~{x7LsQ~x zcoe=|y^(EUS5TVKDG14vzrvcyU>8n{Wmuk$d~B4-o$0)uO9`>Xm;v=Pc7TZpLEQ@UhE{S0;vtfwO)&sjIV{Yt5amH{H6cS0AiL z(f(vsIggq_BjD}wO3?Lx?S1DDtYzhf7@ik9jc>-U`W1d%NpkIWWOqjqq-D8tScZ($ zEzQ?>cxuOP^UhDvMTbq?evo>#__ZCKtD(O_QRp|(M^)r5mS2D4dbBlaT0_5rB8ypt z_jWRUR$!wtkbFSnh7y5p7CJkWund$CWkVhNn{ZxUmX>DJ3ptUbtt&qpYVq~z?t&}i3038eAw)-NcJ9kv3&HmS*@~|4ZW7jzBoB^7KRl!tagON<>1%Bc zUjcFDu$D$@ZIW3jP%nS~tB^B^E6K>%BCEl-{4z;(>1e|RPFUO0=(Ni?&SqG{CX0Wo|i+;_iQ-PXE?Yjp=1}Y1BeF!MXnJ z&HyZrd1XJIRrN-;I0DD^f>F;J7daMQm@5Z!GL)yrG~i+T@-SA}z-n^VBALOhu$iUn z#$&3|4AOFk^E$WX#F5`q%3qS33bA0FPL)jDr>GYuM(javFk7osw zpIc|hwUJKpxs~B3B)=J;&<@T;Mz`K+Tk69oa=VjLYBl zDuWRgpVEVZbfwEvmQi6oQfTG63=qUolQuOuBr}=z3H$fvZM*!rhzxagzy7@PUXfeb z)2V+nlnU9FGOL(8CF~8(->O#hf^?wh82GCaru|PL*esU!E#w?lMssZAdk{95;c=c|Af! z2PwNvW$q}7Enaa~XVfm)dO9fC8A-9q^ek(Y%!Sl}9u^Sb9DttP@e z#d`z41GwFTn}u>}Nc#!Wbl`u>cXvseOiE`T=rKrzaBo4nOr&LjvkuB~$GeL>FS|ET zpYA317TlX89k)>?9eFML*{FY$j(jch9pv2bYxNdtpc8*|aKRuMv&n*)>6CUl__`dft10sJ~-8*J|*{B)8Li!A>E*#_=z`R?3;H@w?$zm4Y) z2|0_xa~_{A;hOMk zk{#e_yS^W2jOs z;OD}h^IWBTzK1-x264Zp@8?k*E!6%t`8mFyi8vayKSt;$?Cpi0LHM>QKb>r{0)6RH zelFq7{T|@`F1b0RLtGADBR7-u#P!`ik2tqUKOAZ!xZ8b{pJUr0_Xg?KKK|aL{9Ur& zKO{Ter0{e>$7EyCKRGPFpqU1}>n@~yTJhHze?s=6L18;ozb47ar@q~Bs6WA<+l1ezB%3NF0xmn&F zdgl6P5HETBLvrV>jzRcG-FV%Y-_r2-w@}Wz)Ly$JOFt%F^0K$dj#?=1pAm0eiYx3p zZx4UlsAJpvbLtDY)cUxg-|OB_eLEra%%DD*LztM}&j?%B*Uu*6b;+*$jOy;v&xYIt z?tkgqjE3*db%OVIERto#`wL&+8l)rKc63NjRs4QJ{TG{l4*9o){UAH3lHUK6{4KJx zT-G>$TBHjNDwE>Zk;^6zFZ^sO7xQ&RqyB%K?%N8>`#JJxBOTtm*Qot5Ad4D!YkGf0 zI;2t$U!lIKf!@6ZcP;~M;^ph%dy8z`>-haO@t4~Rm-O*L=w?8F9coj!?A?RkFQ{%h zh2>b^$M0`QUR|;)pTqOt!mW$+c{_Oz&%Y#nIiU9LuK(V``)#}*(mQX%4iKkFGW&lk z;;ByU`W+e}+1}q#zrY~C5dIB}ra1pP7(q2d{rTks zu9L5MZ&P2=!RYG&`MpK_bi8B86UX%(irc_QtxIz74*m|HCtSb2jPgE5J~lmf@NAJy z=e+s~_Q8+Q>Aa8M58?hba@SysE$<=T{{_E?Nb8^R{&l7!J(ZsMnB#Z&Jw?3V gQQuI9JI_x;FH}W5%ljY5#{c5|V*K6te`;d}*g;9v(*OVf diff --git a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java b/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java index 80bc1bdb78..11d110fc31 100644 --- a/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/TreeBlock.java @@ -15,6 +15,9 @@ public class TreeBlock extends Block{ expanded = true; } + @Override + public void draw(Tile tile){} + @Override public void drawLayer(Tile tile){ Draw.rect(region, tile.drawx(), tile.drawy(), Mathf.randomSeed(tile.pos(), 0, 4) * 90); diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 5af2f4fc4c..323a6bde73 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -545,12 +545,16 @@ public class ServerControl implements ApplicationListener{ int slot = Strings.parseInt(arg[0]); if(!SaveIO.isSaveValid(slot)){ - err("No save data found for slot."); + err("No (valid) save data found for slot."); return; } Core.app.post(() -> { - SaveIO.loadFromSlot(slot); + try{ + SaveIO.loadFromSlot(slot); + }catch(Throwable t){ + err("Failed to load save. Outdated or corrupt file."); + } info("Save loaded."); host(); state.set(State.playing);