From 6a538afd70af28551040b930cff8a63bef28cdbf Mon Sep 17 00:00:00 2001 From: dginovker Date: Fri, 11 Oct 2019 14:09:45 -0400 Subject: [PATCH] Fix server crash --- .../redone/game/items/ItemDefinitions.java | 7 ++++++- .../redone/game/items/ItemDefinitions.class | Bin 4456 -> 4663 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/2006Redone Server/src/redone/game/items/ItemDefinitions.java b/2006Redone Server/src/redone/game/items/ItemDefinitions.java index cfdde90d..c9bc66df 100644 --- a/2006Redone Server/src/redone/game/items/ItemDefinitions.java +++ b/2006Redone Server/src/redone/game/items/ItemDefinitions.java @@ -227,7 +227,12 @@ public class ItemDefinitions { * Returns the weight of an item. */ public static double getWeight(int id) { - return definitions[id].weight; + try { + return definitions[id].weight; + } catch (NullPointerException noId) { + System.out.println("WARNING: id " + id + " doesn't have a definition!"); + return 0; + } } /** diff --git a/CompiledServer/production/2006rebotted/redone/game/items/ItemDefinitions.class b/CompiledServer/production/2006rebotted/redone/game/items/ItemDefinitions.class index 1964e39f621b68b1a2301036e4d3e762c28e1386..4739f71b9254591f72eddc1939deaded7ca8ea84 100644 GIT binary patch delta 2068 zcmaJ>O>k3H6#j0K_T{}^TbdF&lQNPx+LRz|Ek7!iR?vchl42DiQY)bekXn-pX~o~z zgS;DaM+7C4J^VD1AZK3 zc#9X`)^N-q9%DGJ;e>%DILXVW7~Wwx&G4>{Gk8zKSp$t2^WuHx4;Vf){DdDFn8e2# z&Ux{P7w0uhUHEy4%R?uhFmJkkT;|DSqe+2a_h4c)(K3|C>}`pS3=M6~rZc(J{;q=q zso`8Yn`x&A<`3?P)C#PW=)qQr)wo;Y9)^3-Cb5R0o#8&LmFQsT#QhTMuwLQ;UU-n9 zi(v!9MuvwNq70iD?n0YDy;7x`AYItyWN^)%8!O;$|x5({p%V(PYHYPe$RxngR&V(PqNYQAFX zzhbgLF}a|aj8IHoF!!+^YJx0LOs*&jHAf|~0VuY1y zwu+E03E>tqjJxuFTt@ooBkImwBJ zjNZP9;|1ZyQbZ7^3`e$PuzeIfxl6`UPHeJF1|#3 z{A`mkCMfD;)x65GgX%a=^(H8)2NMWkH;vq=5WN_nkxT3>#&=PoyNcEDh));jGtbM& zs(#8k=~Q2Xy}nmzX9{~b6|=Uw&J5n7h0EQXK)G{z>5}X%?{D_70WOOHCmkjGkpAz8 z<_gZiDw%YY3|b_Wc1gie@>EF@uoQ94aqkeGE@kAkhyUJDk||5_x?S>t7c*MUGf>;|ZwYsiZ+Ik_}j=gxcC^=nYaYxiR?mcJ;Uu_TH;3#>{BB`-U w!j6*XEs_Ox$qGlw3l>SOUDD|&dC?;A*(IADB`;Ydb#_VIK_cjW@uSNB1E;AS3jhEB delta 1825 zcmZuwSx*yD6#i~$JDuTHg<4F6#3crzi3Jfi6kI`B6s!v%ZdFk0LR|nC)arw;3XF>T zz9I?*1-EGQ(Ffo42N<7yFflReIoFDl$uyboyUY2`J?Fc(LzBKv%=_@`eiK9&t@Qcr5V*y%K#0OC->*VL;+3o|*4F1;IfKNetq-#0&Ilcq#D;_Xldd`$c>z z-OOkhTmX%9P@jtFWMaYHDyD`NQ_qU2ZN=2NVrpJ7^{<#LP)sf;CLxlQD|P8^vS~@fa#?8Oo@ja++lk^UvK6(MK#$LFiShsf2V-gyrU4Urbb(LA|DA z1?@|6N5i_G5Mt~Pj98?h-VGP%PWkwO9^<5-tReYURas1ZT%mq9 zQdT!QF#(%slmd?kV>69hqCT15MTKrocEck+U7*g)_fMHoPgO^p`pdNUcZwpnU@Mnm zcKFBU{CBbw|6S9EA4tP+Y#`)j^IaD6uQ^H@u`QWC5c2T(R!O&`WV=P;wMzyaB|9t< z%`SQGD2Za{aA7{XMD7z>j*^2GNx&`%J4gf$ IsdsSr54d03umAu6