From 4038c1182e79373bd3b4c5d6697cf4d45cbbd752 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sat, 27 Aug 2016 15:58:32 -0500 Subject: [PATCH] NPE check for bed location. --- TwosideKeeper.jar | Bin 525677 -> 525716 bytes .../plugin/TwosideKeeper/DeathManager.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 50752bb6dd919014041bd8d2018121e518d22763..391da03020b59bc9fd8397d2f6ee5150b44e5685 100644 GIT binary patch delta 3181 zcmY+G3s{V48-VBgzNvR)P)eq$QH!WFI?>Sx$yrHskoco)SefEq``548kxfw!S-rGG z#ELeg9De?B2vJgzC>cek(Midv<368v9CohjyXLy@_j#W8{LQp%H~D>s34g&{hO5Ql z@HiZiY!Ba@Hj>F5avdmJ{Xs&R;cTA^D{f6p)!>k_0VOI)eo2dSRzB?Vu6Sr4YcOWnTI1thqs!gyNq-91dR`K1 z7oF*>jQn5juu#t#&Lu9&2(zElQ+^aEhE10%ilh%Dm4B54-xc3l=cE<;%E*3(k)NPJ z;GTLTA~Elh@$?9rmaMst8y&1`^2Iv#ziB00J#$}GWD;cdu`MnoGG~!YSm9VCjXsjM zEHlQjBl-NX>~m8WCA{2xFgH9lsJ>`t;-S>qkDLa9(Y1$}_N^06&E3I2-}mfQy=Y#I zTTBm~CVgRgbcuLEzIBYhp|RaOV|TlJ_oX98xL=X%-%=SFu**VdZ9qd+tbIFL3$GBXCE#&-~8!n{H&} zXRNswCD-xbKj=N^ADZ&poHDKW!js;6BkjVTgUebwwq6u{uuS<(Muy_H2Gq;vMtk)R^I$+LfLMiU%Ak zv>eklbWGzNRankm#{(+QAFds)v*Q1#aMhPl{UYzvt}C5gQ)Rh3-d>jcH#n#+x5n0> zvfn|^S6oe%y%}-m zp4+6OcH5jstTbJ@B_yGw&G^fe<8g$tZG{FDJTyEEJY0A*;L*HTXn?k#rA0FATY#M4 zR$fdhKr1!=c_}enf;>#vdpfH1y5zz@4(FwS!x_i<_DPr58{ivd$dJ9ee2hzwHC<;) z%sW#`i2F*A1ud~4=13{x;@PFhneMRqYOENLrxHk=N)5oyWzf8CIx#!TkPYRAua}`E^v`pM zoBkNeAD>6yFaQ;ROCLi3--o!xK3WC9};g_)IdTi6=b;bM7fI$DX1|v`!TZQhHQ1`#k~AtERNDg%WAw(Y2H| z|I0F`%O$lWU{x(t?yo==%oUo(=V*Eo4y^==(xh>?Chdwh6+!aYL9{mP75Svgr{Mld z6ikO|2ok!I#@FvUwDq}Y14Ns*kThUnm~JeAP}cS_EZMGrbMfmt9*u? z$T<9*&*fGJc$bs2tr>1w+XaaM6 zp_+Vakc8=5tR`b0Mu@9wAbEiQH>Hau{tUt%FTwW&eDg!G)lx&Z6k7^6Kz;+j*A+REme@L zf(udULLxV*kR9DLnSj`n%frPg*mMim@63qTNJ5Wv`_BCO8jicj^Q#fyz$O?G)dYvm z!TYP`;VDgMChh7=jHfSmIKI*Z<@IB}8id6$+#&2q;p5TGXaubvN7|M*!-O2;3CxP; z4#kJqchZML-0x4YUMdL~+=5(be38JK7C4aQIIRVF(`i-2>9itOsuz2;qGeP%KHG|X z=z9Y()eWmvF;GL76ra|HMo{~4P#aoGrwZ9tbKKYlZ;3P!fomcS9-j9Grr>QtOxhb{ zOLIpN=mVfauuVJU$C?v&sT~58urX}09!tmJ0RiAL;^(< zp*fD>X=CK5@%=l*#E}F{c7%W@9kBXoZ(;T8or$i03!^?fjlln>LCl;^=p(_Mn8TgW zhvzH;>t=l^QRwlHK59Kkfd4y)&hjE~-wUD@@1WRy*lBiBue~+2u;@LQBmTrF{2?Zi zHKGt=ir+&CQ78e+4*&sc3B5m;#ZM5kTTbAN9AXT+U_h#^#DsT2b0nNKwxh1+2$F4k3USQ$V4*YRYCwp|7SPG?1H6O+NuqEAe5P7r+$!pq8c#&xUa| zRa2m;CSs4I1+&{+t+LEPeLjSp3{OZk;2~U|KT~@IvBMjSlej!PX3-fSFZd5(mJNrs XgA2V1vcD;P?5n}k)|3_?_@Vn7mcHO@ delta 3108 zcmZ9N3pkb88i4n|_GRs|v6bYmMAUk9C*2UuiBzQ0_cWf0 zOidRmM&!&o_5k}JK{#*RE zZ$G*$(6iD>GyK#FwM%3}ZpxhrytPZbR6BGO6 z%`D5oF8;k)-xYM}EEjKx$+OxiiukXr^LTdFfUEjGexE44q#`jt`{+^^%hff~wA*9v zDc6O#)NJe-&T9`UP%Mpb^T|Fkx5?G=k=rlX?QYT?MQ%1Oty<@;Ts^F#nq<*Yf(dHY z+pP_Y#fMxDY^=*FTIXJ`zU`W~)75Tuky-Gqi}nU%Q-`zLrAEC<=Pznc+2(5&(dOHB z?edN0cNhJG%9@T>*BF{=hv?Z%sP%1|`_wXLrJ8PzyePTj^uAgBGWfxJeOqODf0Fyd zxToWGtER-PEu50Hv^7b7*nuCaW$TuDI@N$%nCfBv_+WD8gECo0Le;Ux7TqypOl|vj z`mLH5o03;7?OEzlb|Sas$~Vnt3oVyK=!whqC(JI8#!3%Pb$hqlZw}uyuIagBd(e6J zwU-_h#jD$|Z*%N(2tehbrGcqSCYHX|H06das;*Y6ws>Nqbb4S+iKl$IP2$fp{#d-u zzb$6kW={jj)L%=i;w0@MiS`#4h1^`%S>r4)UE}M0*QMfY;{)jd>x6}IFa6$Lyf9=Q zQDXM*sTmVvQ(x~$JTWJ3cbiE0_Kk%_A?*&fEz?#cRwZv*sD1C|_`XM5uDUjA6sAdV z%7yIm=x3bDx`588MYYuz_)Wofi}+Uqq&_;4E$QpC(@VEpTGdyV+=!N;50=a?-O} zvY_JXCZ%Uj#CAvCDD|bJCk={*xm_>M$+d#whN_)IdpV(oUUn-)$IrjJW0+y_m#E=N{-w-Vw1HvBT6?=O=cWY*+22qsS^kCLuN-TmJ6hoJ5bJ`zHlqgJomj-q>7(1mRO?M;v>>;GY96?lGGbB){rfdi1Kb~C zZ&Wse4K{$Xhu9nmEh%iaWX6M81vW(%GI&^tO(3EIOPL3dQ9+j6naw&2m@$VL3pwRj z49hA>HKuk{pQ*$$#tr0^cn$KN$2v3cd4w&|;)N_oAe#kUXBJFA{1=uYx9=zfu@Jt5 zLNN>09u&@bFc?f8lZu`#r^bB+F}M0ZyoZ<3xe9MVu~nbr$AMcFR)NwgY>zsg{#`Gq z#xv1i!~bgx*Q&8K(rEp=KHAEtKzkkO;C~SM`pY>99yNFqcbNb|f)&>cUesU*u9osB z#V8|X@O?_Eo+k#UI&1}ZSU5Hc`n9CArg3y8z82e}!It!?+ z!!~HRm%_F_q{_a%82swVS30eq>MQlw4n=*Spx%J(m_%@Iz(J@$6+9ZSIkY$6+33~; z3T}<$k$W^pXEeFWP}oSyTWUp(ZWFd4i-i)3shm>aQ03VvL3^jXE*xF1s&|i?; zjDt~Q2&lE-t?1)n_P-VU-a;BV91k9?r1WjaxT;|CoK&kg&HcK4cfq|CZ$J^3=@Yvz zbJgfZbxGrXy-PIGXuy(Zq$G8Se1-$i?o8_1GP&c}lT>i$V-W2Y6ri=T+3_C=GDzB&EEH9yKvMRkk=WEI!2hy7g+1 z--*3Y*BLfW7nYpmsk19bt|lIMcadH7V-B4w&*3S-nJ$v``oCyad1r@G(3fpHOfpHAVwuNeyWnI~~b_N;rjj0!$!?-;<6O{7l`9f0Fg*-jns7 zG1TP85HrY{%ZI7?{sT#JDW1Z00*o~@eIQA!fh|k|$v~C_50WKE8>uNABn=d|QrOqZ z7lLGnOkZoGCVYroALAfnh$Qjvrmno3L^%zUsLUQ}^j{NmhBbD*)VvucX$Rj^aQjGL z;t+*27VyUrNE{=SapxidL?XeA#H~V8ZYDXV1SDX<7vRKFVv0qhW)dTmav!UXQWzm- z9$aUHtGS>tDs2!6(bXQMlPuZm3t;jTz6tcOlsb8oR1F0qKY=1}e}j48&lPHOHH}9n zFL6m|pk$PIJVN;vBQy=x@`RR59vtHdS0jt-kiZk_fLkUxBU*f+486|yY&0O8FBA*D JEyd)A^nXBv#H#=R diff --git a/src/sig/plugin/TwosideKeeper/DeathManager.java b/src/sig/plugin/TwosideKeeper/DeathManager.java index eab9281..79846e5 100644 --- a/src/sig/plugin/TwosideKeeper/DeathManager.java +++ b/src/sig/plugin/TwosideKeeper/DeathManager.java @@ -43,7 +43,7 @@ public class DeathManager { p.setVelocity(new Vector(0,0,0)); CustomDamage.removeIframe(p); Location loc = p.getLocation(); - loc.setY(p.getBedSpawnLocation().getY()); + if (p.getBedSpawnLocation()!=null) {loc.setY(p.getBedSpawnLocation().getY());} p.teleport(loc); }},1); PlayerStructure pd = PlayerStructure.GetPlayerStructure(p);