From a48859be6baf33c0deaa40c5bc5535441ca45f4e Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Fri, 3 Jun 2011 12:02:51 +0200 Subject: [PATCH] v0.88 - Fixed players dropping items if they actually die, added wolves to default waves, added world-node to config-file --- MobArena.jar | Bin 31207 -> 31415 bytes bin/plugin.yml | 2 +- .../garbagemule/MobArena/ArenaManager.java | 3 +- .../MobArena/MADamageListener.java | 21 ++++++++ .../garbagemule/MobArena/MASpawnThread.java | 11 +++-- src/com/garbagemule/MobArena/MAUtils.java | 46 +++++++++--------- src/com/garbagemule/MobArena/MobArena.java | 1 + 7 files changed, 56 insertions(+), 28 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index d12821e870acda90555655ceee300010d317ccd5..81fad6392f4dddf7bc97ed2f3a0d4400b1e6fa9a 100644 GIT binary patch delta 18640 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 Cz3?so delta 18392 zcmYhhV{k4^*EAa2wr$(CZSUCD72CFL+qP|c$4+)~?&tmS)tRa4RkMC~O?CHL?JvOR zPrz_WvY=pSKv4f(ZkR+kUXcG#y7GVcO!prqlK`{-uV@1c1Jpcne}9~rk|$+BM7ijh z4&kJUgkVdB5TRN^C;~!I;+9^?y`;nBEW$E5p)U(p*9e{)UKi4~yjw%9`Ln3xZ?@Du zuIsw4-8FZsZ1gqt>-9A?-yD4o-`?^$88gWi>_29HzkB!n{w+K7e2iiO)g+#abime! z+>?I0K*t@A19-k=p#%pN-CkIG-!=9B>1p;atTG0_r`r41W&>c4_T7Huk$wxq`&Vc0 zg5DK#0fZxj&-eYVPy52(@pHepBZO{0{X_<#rcsk>k=dxONWss#!Y8DeS0W&bh z{07vin=Iv6o4-6gp*xy1E~ogy+=|Te%d@`v^b5pAqUuT*5ax*tn6#bb!rC|~=2I$e zN@>^1u}jtJCT=qR;z}A2r3MZf)Em~l2F1f4FfPJEYgfBG;$Fr|Ys)mwiFvjQ$+1x; zszMA1fI*7o9lfDcJ)D$j*FC%xdSNT5skH)I*uxCHx?yzT%{nj~(57NE=uVYz3Vthu zi8+)_@^0D0G!L3U{wXn8p;sCQ&C7L6aPxe7ofiwy$eVOfnJXhDgv&E)^P>imZVICH zFh^Pg=m|ICow8>9A$*>8@DhC{a_nhW@#7$Ifc)Rcy-x<-RSOU9-pmZu{T$2f9Ot99 z{tc=7mgFlJm7q)cNHtAA-Li7ZtF`tFQ3K33N|ibwUQOWLF|u*x|spLx{n zSc)SU6xo(mcq}B^T-PoAZTXU!HnOa}j2ZlgAG_ayejPY4A@Y2QSTeTtb2GJ>S zz~m}V4RQ6~NY6hh2eRWR(;bUiey?SHgL0W_ao$!uR&V3Uk(N91uw@+hjbAr6kn)Qy zvH?kHmYO^6tkjYXwmUCn(&AlWp;ufP7k1G+Bh;}$N|Lhis4hEVe6=3*la}GhM@=Qg z#HU=7H$2$QkU41NXlgOUBcLQTvx1YwfSZxs3SOoDZQp$IeCL}u;NU8<)93BVI1Ap) z_%ukc9<)X5KyZ{i8BVRM85yGikef!`IiwTzRL!*Nj|+>OBlarPmTXuvy5k z9`m%=x@DU-n{gM`!>>u^G;FqP)!s-oj9O7iLd(`Kyk>n5_m)_v^-G@WI=b#nhZ3nlEa_DTQfaE9CX99ayF$yoH}p)i@V`7?H)?8#mWxVT zt*Uh&Bt$XW1*msSyawjE07;Q$z*5guGjE&<%`6Bfw_0icb}_--T^mo^Ha*pw2~D;J zUVhvsstc{%5^C&dR&y9pcO>PQGpf$8odKLyb_O7ud4 z8|H@$3v@ExI@D-$r-c`{W^N4As+v4JV@Fk=8CHV|@g7>2g=?cP4^nN6uSlsdjQ@Zj(cUp8X_(NbL?p!iEyfBMgD?c&1#*R83iw zq!y--Kb|HwR9f#rn;Aw8Clv#%S2cNcE&1B?Ou!Q538G%ckJAV$L`Jqah zKjw#$yWrb=xEF?0yBImx0mCSoEEu=rpnS~aLqow`)DO`iq2c!dp{P83Q^KEWQR5HD zvY)3Jq2Uk2u!e)0^u9`(luk56X8*i918@IK#)c$jpXdi|{$Z^lze~%e_mvSB71}eM z^f|>C8`&f^afx0_?%mA_0Clb=zf0Z*aqcGfn8+ntIq5)d-;OLX1-O@0XM0DtaMO*d zWAugJ={oD(Hr=BbG~B=O_+m0L#lf9PQNriny7OqjR5_oJ?7H)yD0YY)jgVR$&5@CU z#>u)e9&e}Z(7z>|1&UFKq)OamRKg&`1AD8b8p&hGvJps^q3Ban<{Dsc@+P>Fy!4Ji zAShczLu8XbAO zP4Z(11plG?2-tC$1br+p3M^8VDmR6*HRA>4UCNA19_8k~RiAOfA|#RcC|GF8AEAZ~ zj`||@%7~pJTOCc3T%r7tQSXvV9LrJgpj+(Sb?>3XzmzNS1;A@Ni%9cTwRt86`)U!O z&fpMc>#{6rh4V}wi>!ZD_{KwFsWmIio2qs}o;Pmk>DmGT(+`O}RsP+Hb zWjoM%fNHjNXcrwUwmy;~xjosHR8js!bojhP0(V1}6(CmBdMx1^Wm`^?ei8pdseBHL z2u038nGy8h2Q;3PKn#o0Ts*-Dx;%oQB&eqG(dW0Es6NJo-W^=0`RcF>xb-N|eZ=^t zRr+>ECA{=$ku7GrrP#_Q)u|NBgP&;2LYPajzj?6$sLpr8saG(czu81V;}1mHZY(pm zb7VF_v&J)jBoy1XFYQ&4$8$5Ix=(71c{u=Q(9P9<0Z{ZKXYOeDE?zRt@kGvXY>w!{ zt(Di#I}r7hwRHwR?%hjO?R1^mEA$3`1V{;6_p>3Pm$U5VX`h6h;k~7>XIk|RuTD{M z51Q~oG)FMxHF7A}(xTQK+-N#BWo#=gbtTC8WJ7IcE@_3&jZ|5w3nvMYPpjZ&d%AlS z1jN9_0KAZGTXl9k_yUAekKSZ7lvldW7I_EUur|C?aNWz?5*I}snKUj5raPkOvs-`3 zP^m>`>he;?o$#=F(I{BIjr?B3Vo((+$a(F87B`nFXtuPeFE}fq4bta!R~(oj1;`rd z{dpbbCOf;+0zJP7H0)up?zU{oeZbDoq4WLz0GiUS*fc2o)~r-JoW>Day{)?O9Xw2; zNcj8yO^+LQ5kbV-NWM_Bo1&~%7L_mBZnrS8pUEugx~6`YE!-Mq$Xz-$-IZCbPE+y? z$y9FT2x~)D&7Z}pswg;!_$)gwE5;d{Om}8r`JAq++^vl_F1DOF%=5n+ap(|9&Mn5& z0-!55982_5j_o~eGTbM{S7WQzfl9Zn-gu64cVPKR8k42lZi3MNC<3ES7e&U2y+&}E zDD=oivQV(^EoZj1c(6BjH99$WEwX)m#C><|%`{D>gLj_}&BpqS{qrLBsN^Xq*jkQ3 zlp_=qXS`uiG`E}YrE9;!3*%w)^62aO1RVT+Wlu2^vbk>0_%Y8)j%wa)w%JjtFR^X@ z8*{?Q7y%#CE$DFbIo`ATJV(H3$c!a`g{^YL^8n6(eBwHo>Vch^(G1Mo1Y~~*JNQpz zZz^Yh7(4inWGi~U#e1_F5?EMhA`D7)G7O9x89Oya9j&~FEimA0QU0e zJNtjxW1>9G*ur=_mL9vdW!j zAu`1Q?4N1BA<@?PAiXqx^CB5ta!e4;3&i%Rw3RCFg$V0DaJIsfnL>uLh|%DSF4&^N znar^QiNV5^SwfULT(Q=WriM-}0CiA`_+u@^A;ZhFdf0i)F`1$n=y`T$+=rbO{*v!} ztn;w*gkwR(VngZ{23Q7WXQPMY76v#57H3z+bc7$YJh6XJ8qjq$ z*n`%E-3+HDu_RpmmF`H1$a+cvYr-|P@b$QZp`n)iUT3H0jXwh}9T!u=a@d0qg{bJO zY9^-S3#0kZ2hAae+l-Tj~Nx4mi_mrnXSVw+f5Vd`0HL3>p(Tbrx?6<@?T< za54SIw!z>=M}W+>5a))Jyj?NX*S-AbQu_rfV_`g^xw;k5sJU@O1xD`FRIgzYwYasN)wq&pqz5 zY8CH2Z`kzRr9NN+TF~bQW#I$V+n2ZQYAtA${DS>M)$tmPVPoH43O~2$KNm|YFoebVkQIy$) z1Zzf}Ce=!;77_$LTJlJrKc(rVF~ZGCgNV;kg*AMgf%ex@cEX61$nkm8pyXD^$?2{EU)nBYOtpNHBD z7;cKh>E3`+4jj72rGh`WlUvgnRy2HUUQ?dSYG=R`;}aZbm^j@KQ~e9|e!v}w!Vm|e zkoS=oSOyuVY05g6tgp6jUz5VGMM)n93L9Eq9I{evK<*m(<2OUPKiQjP$RD95@WIXf zXeIvuxP@W?C;MgvO_$`Vc})-{^Tk?qrcc!4%&L%$nRt?ZBD}YYKcfi?UdpLr(77h> zHhzw^ICT~gLRqm-67Whf1dMwGTvL_v41CrEztN(OTfR4K?UZ>Tq5oL?k$*^cyb&_i zpAIZSpV0*^R%^oH4P(I`(CZ|aK9SI)(t+p)TwkA)CDVBg0%LHZ8h*%ZvFSjzetzJs zgs$g~y}+@r4Q}1TyXF>ck;KOv?|44WXu|bnk6kUI33aA&A9LW`xogz(I%VQXHt&cJ zy&3iI*gWf0j?tAH>AD=xm+Rx zdfI`Gy@9=AZlAaw{1Erw?*ATl(ilrK^sEraezRJ;JaVqDT6*SxoK^^F(+WtBb489m zK6{pD$a(=1R9jZOSAC>58Xq`A`-uR^KNyegTGc!Nw;M_OLw{<(>NmPTye{?8*M=E? z{B}o|AJof__5M>wa5Zmu!{?`Qv8{Lolsa(@L`dH(O&3W>5zsm5r&W*5p%f!L_DK-Fb>T z5{wJ@j?B_8F52DT8jJYlmhufGn4d|@k8l8pk}M=t^04cq5)u&5I}s4je<=m@|BES- zcW7vvRZ-MH|CdZuanL6tx}!EV7>U2Po9X7}h6E-` zPu#v46I*-$Hp0F`EJ>eT#P^`q<058w?loZ(8^wPV)9@QuYGgWiQL}#%tNKsS5%{pI z+e_v0YI#+4zyI$$^Z;EI4-D1}Nqiw)7;}*++B#cI>2n70VsYpCig)|!ay_mU39Z!*=sV}{8*FWAs`FhTpl z15DIoHuXq)#X7<$nv+iircW=q5SO6l5u?;7gW1OaKr6Ol(^XXV23DHGLaRK|h6bs8 z&LM2ae(l2`C-KT+f%6|#!)RBv{YABAGAVmIJ`6P=C{w?09{#z&qyQI_ZHI{oRCZV% zw4G^s0iYw~{K6Vf7%?zlH)EB-*$}`BaeI^(_%%gmGC2TBhwB+32{+oD{TPm6efV4b zPh2j$YHN~Jb-Znk96Tb|ZF`=STK|%%!7j=5wrojTG6Z^t$qd5=&`uh;L}vDOG-ey6 z#9s%nu0ap2`-3dB`0W5Bn*Mh>p}R@G-h{$7UUuAjYXhC5_sre-&2+H$-dyiNA}9wg zd=cXiCcW*RuTfOh+`c-G%5@ihB+Z6%8)jF@k|D8;reliT_NO@JMBOTiNus}8s6Udp z)FP+{?SsEV>J{a$OpD@TRr+3F>XbtwPs}Eu*9=xF`L8HMdg3U$$k&AITyL2wO_zVj zGp!lI^!S9Y@Ob1GHvS8#tA>D(tZ?9o8?zGCmxMCQ_yX-E;zX&E7veF~TIsDGQSSf| z4>K4%X^Cq}OPp~)-xnGMle~M}4PO*nA-S6J7!FMd!US>g<^Do-p`ap5{g^bQKadjc zeAC)ozfDZ9;Q#AaaZvvszjtWp zlV3bhn$dXp!T!fJuFsXhRK_khr!*l_?(|*yQ|{f4 z%bdsFes8#d*NrrgtXL;JZo_O8qj5Jr=HawP%aO^R|7e`7%C;;3+gE+aoI@+K72VJ@ zY#O^er;!$`JE)NsyE~~7KjyE|&9%E;XtnkSySp#wI!lMb&h_Ry*K64ZQ}t0F7)2)(py87PbQz`px=y3KRDw3vBQ?s zbT9_r$o25eA}I=hz+CWECvl`5>&BF6#3&>6Z~HNj1eQ;Xoxk2tyY@RYuf~z|nRnEn zFoYtjXV{>J?K?x?_(n5IpF=q0ytLqEjD`OD%6~E)=^whhiE1 z+7hlNVh0Rp$I)oD6f6HSEex15fnOO_XD>TG>p+1P^8thD)lC&Br6~*@QlI6q!xmKk zO7%3lvC@hJtNzyELxWyg-iZ_AtCMK4$c;?R#fS=NK?ez2YI-qq(`OUXIQJ4ocGE8^ z*N<(d`fCg*!a9nK7(nYUb9Mbn$xukWM_C2&LRI2T71OdIkAH#Uqd7Duc^g}aOF&Ub z1P~_>sgFv`Pc$aBE2t7SOiMNQN=eeCI80ab!z)y( zFB9XL7|2X!^D4%V!ibVcTU}pIUscunwmUNHM603W&#c_>Uz(Q>QIL z!@L3@Sp-J*&A^0i6$G;`W5lTNjKl%sf)ygPX5Xm4Ne{>Z7#WSsS&nw{&(;j;k&-I` zvQDKiQ-713uzu5=LKJ@y1rnKMhNyIEtr_Bu1FBhZJe*d$&l0VPD?nuQvcKiw-STwq zEVNIcf@2I^6V)PPsJbSgjnOi)$Q_!PpjiRxiF9PfiJ_^1v4OdPbY)T`niyUrh8WcW!7ahy#^iFcP6lRK1Qb!+5`sgqsLYt_}l_Y>bJA{mcC0ojADnR+;R56$h!apYa*VqDRS$aDoXJpZ31xC53qV)!`UO|Z z6UB;1FyeIlY)_O>K9zS~Ir3#t6V`xy9KwT0QBmthFR={YygB1r4anzUSefZK<~bA` z*wYs2cvfNxf=by-{qnr}OOEzLP-H*Vl*9Z49(_|W-TDyJlOpz2%`WsXqU?r(XRX8< z9ld;I{y)inXf=FG8CmkPmtRInug{@MX@BFGXd5$dh$E-w$rJM^ZgMc>6XO8x0J&D; zG$O%ti-#u{Z~NsHM=lpHHS=!1B~CGn=}YhARE4P>EiWm*oTxDch5A27UYE*pkXyV( z$nwzQ-s@FrPotYGV$%8S+TRxgQnqe(T)rtm&|&C`8cb*PBdcO-O8UrZLdXfN>9|}c3QC8|28+%JjlbIF5*zlLP5a=kKOo^fo$>j={ zXNws;;)Se#L;nmd%)3`9=kOGq5qp0uFB6TGKwLXoHCJ^~I`$}@no9kWVB#ujC!0Ta z&GRlPi*wg9gOc{Yh(A+pN(F!bO5pz2^WoT)HwReVFahX-gF(^b*7M1Am|bXAIW9A#-7DGRVy5MAV)Lt%LS@r9i0c>a}(>$8_HInUnq z-n&T#sn0TZ+@CTI7@vTx%6f|>SwX+9-lS-Tia{TuYSP3mO924MR!A~bofvuVc)n1cW}=wK*ieqVSz%-fo*baa5^NNNG=t(mpDpMT zg!h4o7$Gp&@$*7Uc9h9t#C?d5>oe^ZuCcCKuGv5>(<1lM;?06PmNX+*^ov_GLpG!+ zYUT$>Pn60FZ#;4MX=?k`_?9V-@`bzwZH|&D2Ar(;n&@!{nU1Ys)k;nlEiJAY^&B__ zKF%H&&rU8#)D*xC)YM55PS+)1dYr+F`DZ8d(iD}JLYIr-=XXn++1_IGkCqoPAMNK3sdgFWXeD5sgFvn z7@YTpn2Yj5KDzN%tw7#Nf;?ehhb=8Mm-Kjn>K z5A)&+XAf}x(xSA=w4Z}{&KoNl>m){^MwCOmWEf2_|H)hdhCD6t4V({Gx{d00xwFHv|WX{-f2vt&$J3W|a(R(*Fkp zP&G{aY&l~n?St@h2xft-DHl}C@qbLsUbeigDnqiBK7#YJS!(}7u3YXwzJ*gQAFP!r z)~mp5ZyYu%%@*^3TRj_`kvu|^uS^M!V8qU%U=F!O~G|Q$Vn@2bjE~7movSRXJVvRj*D8{k}dE8_9X$lDEM=F}2DZ;YmA%{xAK<1&#KICYH zihB3Dk^oZRk}FiW=JjYgJHb1_LyK3Kcv7PvzR{(toGYpn!r9f;t-2B_SQ7v6!U0g2 z@kvcqznlnazE9KpG7N~q^mKftBp0YAF3Q-kZ)#XswOnE=p?+|rJ8CnfuiCinF5elA z>G<#eDttl3!qCyVD9P5=C*n7Wc6o8$AaqJNZ|$xPE{ZB#7n@pXgJd2=t35FmLNS^$ z7!-D2tIMoirzCM+rg=x-?zUfs`2oW1mp!D<`1#dXjj%=|Z;bl`{ZZy9_bbRPZxa|k z^W?hMr6$iH4Ad0z=;79+TJqE}Y8sceZkWJrZV)Dk-FRydY&^n;ZyP*3_*mRiF_y?- zaH27Mg)}e29aS*E8CGI{j{v~`v!EbezxZ0PKtL{N|9|!VKY30kgZO{)oL`wScRse zs%uBQmVnjTrqf{Ey7k}jZrPKp=0{%qzMFmfYmscbLb#jxVR6>$_2$Fs^%)&b2pT~0 z;0O7QTuwQRoRb)%oiQtqz}X4dIdMv!mj~tyMZgMW#lL5na}I!vR?C_Fhi8B0tU5Eh zNi(PFB!DQ3caO)Qx5mO%CdCY(-kB*f4r>msFxX3 zjmHFD?$Vs)l*W4?UUQ(I3Zp@Oh{I<%*orVQdP$?<(yuW3vg6=*AkhO58pJ{84>Y`gs66k$W; zk@8!U?AX62DZ3i2M`sjZqt=tgsh=LRe%!9!BRq<5{# zv)##k5#Z+u$?4(zgpYow@?cM}mkc+3pAfb0c3{j`bo8e7-52%ts1gne2zaY}7yWrp z3|`oo*CISP8;AJ`K_)zHHKlQ{dM82zOwEe!xH5B(tKV3_zf=I;8=`voULvC6tKP9d ze`B)8J3qKN`wz~b?ek8~(sy!<{1qNAs3Cq*qZC<*=kI5lC*N&+6$Z~UL-)y!Vc$tO zS<%01L3!>y=*Asr-;<*HJq8e+nu7q21EB9LoPd)vMVh{&0NZcY;D4hj@38MQob}Z2 z-Yj_IoJkXHKT`l!fa-%h`o7A89s0iVgFgDc>VqG+pyL1|)<-ykCyLhB}_WE1#ZfJ20fXO>@5jZ_#8y@vJ$Fg8IACZ+ZQ z4|dUAtRkyS`vLbhwRUPC);_I#T3LwY8oq^0fpotJkzrX&YGt9vCtCO=z7DbbD|Qp; zB;fa-L=Rdlyso^mLLh5rlgVr4#RkB&gs&tgx$l>X4b27>NTt>>q5`ri(wH zF%8w!$ODFpH}v|Jo3~Xj-oS8Rs!53r3yg(dA;b$vz&epb2|_XrMTA8hQM7^yw6CE( zgJ*4CI20$MnfPf3=L%Iv6r0PXRTw@*GO~dhY_TH82B<7F8j+qSnv4qe)&mk!*@4Q~ zkDf5sCR;^JWo;%{av`|~SAIT4j#+)>p?EY?vlSr*gMUJ`tLOxWT~R$VOgY87KVMZ8M@WzH zAQOd{L{!aRR=rDFPiceZfPOhBkjD^RlL3K5WLZl@zqHXc&#f)*&rwE1c*aZ~CbdYk zDci^r^@wnw6$~{`*@aum__pw?m$bfk8Ld&|*ONg*;4>W%^+PsU4X~j@nG|Y2QYZ-W zWG=-{$wRYHiB*wo_Di9v!Tm$~Y>9!UNKA^Tq@l8?#g+y!7^ZB87^YTzAu6M1nShU{ z_A_e}JO`|JgplSwJ{n|hlOPB{kS3Z_8U;m^oV*-L@}vtpv$)*q2phA0Fkq;k?Va^o z9FkMV>7YG)AC%s6vQdB7qjiP>|t??)a_ZzyiJufSTlzvm`!@fbHE>)Gr(i3P4$|>lpcodix2B02g|hx5Ba1VVWWr`X5=Q? z0}M+#`<0t~rUVwfrNgU@2|}Fmh@L!}DbJ-y-YF~wPL;IHLp#Si$l=fhw-{5I&58ZiN70A~{CLj7AmZ_c~)T za33+ zjf^ZW4WnNmVh#)}BV}xY(x*ONrPTyTz17TmFX>2_>iooq%-0=( z?b3jB+|nr|8U{Gs*fniuur;O@m z5>C;B_uz)W@)A^%kVv#{sl|x1`QjJSYL3Avp0zePah9Sce9kwAg+FPjKwwVMuGnfd2X zrdp&~Tbo%@DBw?%a_b+7pv=O8eL-ndpV82)4k=$zbj+oRRCQpU8WHTtI0=cT2F@OxspLb zX9)+^e+w8GXbCTR!&yBVdgYPVqwVZY!5xWFQCw#>{|39tMC$%)BzI_|wnyl)J7seT zG4BkUsoWv1t+h>~L_$4@ZOluIWIK4S9YhulqBcV+&P0}}scM-Aa%p!$PLbHhiaT{v zAT)Ky0pg_#_atTF(}7+5!#k2w-|^Qj^m9CJ55FA&b@5J|Z*hO)uJ2xXIFvus7v3q0hsUp5m=u|{c*?iY|J(W70j7`-#JuwGsF zTGDN1o>c_*VVs{NvBP>Y6({XqFG8RWQZVgnVY6(^G}Se9hq;3o_77iD2&^c^vK4xz zfK5@SjQTO_Xi7ASaUw_D<9()r6n&A(?p*gxeq+(><))(tY>hUe!Bd^hzYpzK>Mu!G zH(;EKbN?-oAc9v5n?#W8npM=KzzpaRK1jNo%vM=|psO~W?1I8m-quPzc=py1g&ft? zuNd-yT3lJ60sAS6$&AVH-LtBbb@Y{r0}$z-LSE{fv}1}b4&-UtkSOgzWqq`gZfN4i z%Gg8JVr0I7BubI75k-F1y&ISv5b3U^m~?E-$b{s3+V0cyAIoYxC$C8%o3DMOQcH5s zNWV3&?8fAY`K$Q^%4GJlIBXr0>_RDpV2QDTV=?nD4exrx#qJQjd%{@7xf{Y?01NhG zX~^*L0wx?C0OaO3pppCfHDF$WF%_j_;}pf!%xWr^R%?*&YE}*E z0x;c8GRK$9WtdngE1p|q5?y#@uMXP6W&eeSBm_!x3`_>Z>yGTQOttg|j|uPu&ekG0 zY3e>Mj_rH(_8bFLTK731rI8TgIfCsWvs)LGkuJu7YuF%Tl(NwK%DVnpRo!$(*4nJ2wyy;_TW`B>g03JkakffEFBloaad)!bYnRqXmQ z*-kutl*9Cvrl!F8Rf$p>0O!J)a-?Pq3bA#vXp>S-Bf?uuAJD%H-Ojye?-{vE}7pXY>s*Jx43q0lNX_Uu|<)&W9|T;A*-k z3JZ8jgw8-yxODlxfR^K?5gwP6+S;m}zLp;A%`0Jly!?XUMKS>jfRnSCoatvMnr1$3 z`29ax8WNx6JqCCpKOsxD7&6{KNci%GA!9U-o>)1>l3cO0@}wjVM|H6lhngyyU54L_ zQNXv3rg|se=P6fx6@8HfTy#tp z616k+Jswq?W|BR9)$@y%clFhGBMk;dSN7xUM9+q)kP z8I>zn3Wy2HSwoDf z(HDr?2Yb|*BYOW2j$R~^AFni?cIR$_UeQTvh5bw85t(e`@Tns?zC^jM8+VjU((a^w zfz!F%We_qXVDM6*?Ov~HbsOAjG4vT_wl=k-LzRG*z?fRWt+Y!5FU+u0Rj*Q<-0GH1 zLO6GMl6QIcGJX?bkjta1bs}>SoD@-nCcb-6-S!TsyLIDMp6w=nWLTwK!N&@ z1Hs#eMujHnhh>om3Wq+>fI6?hk@a^<XE7GNiF8^~?w5?R&q_l4E}{>jtWxq@pz< zp*H2IA&;)4D6I)jZ9uk`<`&ohA>M#VALi&lb|0Wuf(#c5|AP7?whY)8A=U0D+zYgL z=LK5;zzEBQA;ks9azWELLbS-N3cybKB_K>vxqSi8CQ$oJk*?igPiP(#3$X09fL*tU z^>)6vXj%HcA*0Uy>}D9XGlRXuX}k*S*tUy=_+S1!H-rGy;E{L(jAdq>GIa7t;p<5lIqw=7GBnhrVOBr+ zcc?iH;b`<=Djl)87X?KADZZyiGDuzbn7S)q%H4%wquUyI9mk2TElw#+T!!lLkj+a= z!CFcNHYa2;WNd;r-&e#)T)K+2S)mk1a0gspG+bM~LQDi?8)59wsY^B5)Pnp{82o?& ze%TTG=gj&_Fr%z|w4ZI>OKKGSSgVX&niURr7l}X`-x<~W1 zPCDZpwl=1uGvk??bYi#)8a?f#99)G4oWBmB&yY9!sYp3WicgI^bZRe3bMNu^zy>2;ey6I;hJ}; zy9sK-JEu9f-c0AEH8Z@dN&1I#{?TN3U6b~Y=iGbKf$7b`)qv;==bYlU+vrIG0O}*S z8y%rSB-v6FOVR^!nE__+IzZ+;W4j{tPR&FpiS%2k6lUcpP$mk`GZ;)-NFXV@r#8T< zq}Y=<%)G}KF(?3*Jjl?5k`}7~mv)X4+}jWuV{0Q`M^?(x57|bXqP4q5un~urK6ki? zKql=YW9wzFYrjHcGl{j!!72$q%cr%1o{GIOr%K*xT&D=^x9>(VV8=(mKDm~7DnL>?LFnapMj zE#`-sJMJTo`!Qql9&C>M<2&*PcIppV=|qEZ#E!HDS38tZF~znWTvdubb>!95(e$waAmOz?Nv8{+)?FAm>IKrmmsV!TG~XX{+!-+iF)%ywgmL7B zTXN(+F@Vp6U}FrkHb}BUJDXRqi<2SMIs)?0uUjw+@{5Angw?YMsBB~BgpdggWH#58_J zFG@}5L@7#DvL%t-`vc(q+kXVgbQOr6dn$cd=xI7jOMT+SctR^5Kw{}BrC78%=F39_s zWV^eG`V7(gnCcD<+jTOvk+bcjMVsjMEyC~1b)4!p(qm@pYF+O-N(0Uq3wD4!Gr&AU zz~22P#(j+8-G#6KK<$Tq3&DaRg2(^vAq0RNj^d@wtN>`i@a&B2%WD-G%uAK&X9(QG zOhw@rF$_G#xGML?RgT_+q47uplolE924v>WzTL(VPLdEK>`_*pt`j zK3|&Wy5S6lSnalVp?>VSj$Uh6*H~4)^%owG|G9Yq;T%5coE$P$pD4W}E3K$`B?WH` zhOzU{U4Ti|AqJ@_X077P<2lK>KMZAcuBM7^o(l+Cl;WDHG9fXp$3q8Qcz@SH)efC? z(VkIV*r{~~Y~9&vb+Lh2UD%0r1#I2ns!h(9OV^>!d8*oz{%x`wQ826ri;5gXMlisV4M`tMee} zNc^MumqSoSRNrj(hUlgLe+^+?7!7F?m_-iIp^LgEh_&c}znPc9NhqpImdUx((0y z3UF~yBQQ*$_!27BHSa=VQr04p)hg85FltmXN>wuMl?uWi0+uHMcaKC~pinWcmx|VK z%^wyE-d1*rSYPBCJ9$CEAMUA(wIDf{Kb2r1IiBUWhBJq#nqXyB(lB5HRnJ# z+3;#M&N;>RV?0G*kzh`$+hZ^>W+RJc1~92~7^h%Cx{P{ikhr{arbA z9}>PQb05NAk-rGx^*P{$@(6B5y=4iHY6Y!H`>~|YM;nooP6at))$(9~JappP1CW(q zh0sZ=b{*aZC!`$rl;a}2(At4XS~jBH6rr&-iX0Vws*~cO-qWFub6Z5k>}f|N-n|YO z``1oPrnaYzA4>h^jt*!`qtuX)YKc}*n3M&|{0p#WBn7r5Y!WmOob!oWywe&X@bt^N zqHmi@T-CKTZ7-%DbvJD&*1|Td0mQ{enTPvHIweiZAR(luwo!K9jAl*eNi0)aplh<2 z_&Rmb`VAr9cjApIq%WKEf?zK6!D)uca)X>Ji#eAryGkJX&cpEE`&C`2Kq~Gw|rgKB2YyuI1&qzk`Y-TEn5^S+j<`V?ULYaM?tI(77u^tFO2yy#?(Vba-Uj(4cw-K9mhG6*~qriw3WSd27K z?pw$XjE`aym>o+0ZCIf0c;b{HN^lrYl#IO8jI838+VnZqthSNLD9H11^VP#;q#saz zNptJw&3`RH4l7DA(GTWF0rCWr@0kcg{uFr?OmnB4t&^`fgoQVW7fMhBG~FgRhHG21 zr8)D$HS4*5CbT(Y&EZ&LV4%Wg58$G#yP&L-GN?D@j(oD&GH@&8>xlT3!IjSwq*FAO z!i|}0D z4@?kUofxwT{wWKAsAAE9 zV1B<*XZhtX>0-P+46j3wM}>7AdhrBKpr51io{=5c4#f{1mbVQZ_yDro0m_lwcbM3HB#*=JBLZXO@DVMi z^a-?m)XgIU0JEfPg!)Q-;T`;uq)E4@&<&a(2BssP;z<4;3*IbwyBi zpK=-YAjoJ(I$r(uWJ!$sD%+lNpCaCNFU3Fu%IW#Xa14q zx#cXxXZjK8x#q0$z4eGQ+e@C;?n`IT;7ei9QWlK~s3{(OT7y3FShIadYSsGQ>yrB( z^ag&}zSx$1;vLPeL4JsOVR^v3CVr@TL4L@3;r{%|^&I|e^jt2BY`5J!vfFlkh_lP~ zTwkNuYu+WKDL zA2?G79PC#bIvNM|xZ|8nhWkf zcsL0D>{kpF^d~0B=Rh(fRPV-y_A0eT`WUSYlgh&DuKZs0eY3j`HJrdXjC?fkY@&GM z`cAqVqonEd!fUH3`!RzonHXOxuaG*>ovHT*99SJYh&I*bX4*jHBhY*@&KDbE@-2hT z!%Prg7z!fHyA3``aNS&dwLWp~-VZTrgDHe!H->9`6p<+eiu%G}AF;(09xIf8HC0JSk2|R&2I=~t8JzS7ez$dvZ9(@}*EPBg$*!`$ zD!lu-#V$buD*TZs5d3usWp83YM=Bqc|7`vK-{f~MAwwVy9|$Oj=l?(X{cr!0z=jXt zi7Scz8*A#LS>1YUTUTYJ(VOM$({1HH4v*)PO8WCU?x0t`L!Ncv2FP?(Cl&l746b-F|RNVlW7ANPVD=(&m`0 zdCX2?kM4x)(7zkIe&hyXz&IGr3)Uk%#PQRsI)w1!R~$0^{w9w?AK2%R=130s-6J=~ z{OuDTQtucJZ9lSO=)u2pJkIUNUiNVEIonA;qHka{^Irx7>4BbjTr7FxphgL ze(Qb!61W+YyjMmbM7?+FOHzz@F9}eD_Dm3liyb*06yus~cpcj);i>&}sY-mIw3Fp* z0)_kA?Izm(##D3lmv>|VhlLe@Gkld{ZyBlLuh*<{RZ^neMA72cwM@u49-L-T!TY|$qQW(?(7J(`<*~E^55Y0HkhZ*H#bVBF zJ$EUd?aS*wLxvdzZa1W1cV%-*60Edxb6llfAi$nXjj?jf7M8K-tiA{k|Cg4wDxYNj zS4^0lg`EbCZn^BxvL-39aB-WJ;&<^oO~Qg@EFr}SCLiM-8ynFy&G^`)KU~I}p;#M4 zVVWzL8~cy4h2?|7^gG>|rGNd|2wk)27-u){vCdqJ(yHl?L#h*nQ8)8D#6uFhymeZ~{# zS)nD@v~Q)YU9mRySnBdm0;eaw`t|hLLZzCMUD8hyVoX;wC*3`Dx%J_tdp9<}TVbsC zeRGtzM49gH6T33}LQGaaTyyJU*532W4nJ7NBxSkKcgmb8FJ8vx-B?xRd$#a`E1#Na z_ALFp+T?p7voe2~dP`|$pIGMu1k)EnfiviG`NGUJb6Uv#iB>p%D4 zpCP=9O9R7EPQUtvXfo-~8j;)00md+`WC}=F+)ao3{I0S1J$V*|~Xd?9~me z$KBle-GV39|8Pb&=F*L*thb@9fD1+mPr6WaLHg1N<3KDbfPvSamwkSj~lKL5Vp zw01EYSGBt{bMAb*cqa2Jr@WmrRiq!zi1Nu$&w0M7lv#E9!wL1ricE~`JpUIjdAsh6 z{OUVxX6AWOwP(wdb|?N^>u4Su%YR|(EIz*d7bk4#O4-#WD5q4We#?W2=YFO^{PkJx z7be9mUE{SZdg`^5UA~##%WhBomJ$`vk`fhiBxTp?*g`?BE*A~0Jg4bO!d_nN3!`7E zOqqJMMb=9^arvgUf~|`L>dQ2i^&y0mqJg$((cDp8LGcxo|VV2{nw<&4tfAIusf6#F}}%|I2wtkEZ4*eqFnH z$C2eRyE?v`e2V;XZehP-T${e{!WaHiHuiGgW?q~6=D{TU3t`7nV{S=i=szy1*NYVt zIJIMv_j&G))HjbVeP&)~wC>TRtBjeqHCeXJKh%)VxBIrk8!7*6Ti%LWuU^XeSKHow zE%@qXf--N_kt(Yz9?rccZwjwo?r>kV{I}H00@+--Z`sce@7u6cy-;!CbhGu+w>OGf zUu;&W(&YWU;L_sEuBhB9le;|jdCT1|$1bTaEAPu9QP>1fuWAbn84x=G-)@|nCtc4hi)C!4?2WUbC9oYXBQGWT#P z&&Ge20e5#uzxL=bv}voTxh<(8_v60t7O&JLySl{EMY)!$Y?vQp%ln zb^kYdTOa8C-_{-y|3G4o!2L3xs28Q*ME04!SSWrk_{Y5k&;Nr~Zk10JQk~4sz;Klh zx&Aiink-Q)SAUT2kOEKJdmGny2a}Hr9xihSPCWo?4Q`P)=wG!8xw z+Mf}3DR#!YS%hY6@Qg4t~{ozMY` z+%piE{Hk08C_1S^hKb1lDkwHNpn?aaG!7{G%M>g+qe1~BvI{7pY6%wkQXvnv7kPo7 z4vM{tZNUotE9F31^DAYTLOsDED=U@3T9I3bYA9OMe837beR*`y!y7qSs-tKM$O39I tbutGAFLLa2p(wH_Vqhr9DNWDJ)2qzQ3GikGMjHczC=eb7viOQYJOIHlho%4k diff --git a/bin/plugin.yml b/bin/plugin.yml index b41decf..5f2329c 100644 --- a/bin/plugin.yml +++ b/bin/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.87.3 +version: 0.88 commands: mobarena: description: Base command for MobArena diff --git a/src/com/garbagemule/MobArena/ArenaManager.java b/src/com/garbagemule/MobArena/ArenaManager.java index 89d7eb5..2672a3f 100644 --- a/src/com/garbagemule/MobArena/ArenaManager.java +++ b/src/com/garbagemule/MobArena/ArenaManager.java @@ -44,7 +44,7 @@ public class ArenaManager // Spawn locations list and monster distribution fields. protected static List spawnpoints = new ArrayList(); - protected static int dZombies, dSkeletons, dSpiders, dCreepers; + protected static int dZombies, dSkeletons, dSpiders, dCreepers, dWolves; // Set and Maps for storing players, their locations, items, armor, etc. protected static Set playerSet = new HashSet(); @@ -102,6 +102,7 @@ public class ArenaManager dSkeletons = MAUtils.getDistribution("skeletons"); dSpiders = MAUtils.getDistribution("spiders"); dCreepers = MAUtils.getDistribution("creepers"); + dWolves = MAUtils.getDistribution("wolves"); } // Convenience variables. diff --git a/src/com/garbagemule/MobArena/MADamageListener.java b/src/com/garbagemule/MobArena/MADamageListener.java index bb2b2fa..d7fbd53 100644 --- a/src/com/garbagemule/MobArena/MADamageListener.java +++ b/src/com/garbagemule/MobArena/MADamageListener.java @@ -3,6 +3,7 @@ package com.garbagemule.MobArena; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityListener; import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDeathEvent; /** * This listener acts as a type of death-listener. @@ -42,4 +43,24 @@ public class MADamageListener extends EntityListener p.setFireTicks(0); ArenaManager.playerDeath(p); } + + /** + * Clears all player drops on death. + */ + public void onEntityDeath(EntityDeathEvent event) + { + if (!ArenaManager.isRunning) + return; + + if (!(event.getEntity() instanceof Player)) + return; + + Player p = (Player) event.getEntity(); + + if (!ArenaManager.playerSet.contains(p)) + return; + + event.getDrops().clear(); + ArenaManager.playerDeath(p); + } } \ No newline at end of file diff --git a/src/com/garbagemule/MobArena/MASpawnThread.java b/src/com/garbagemule/MobArena/MASpawnThread.java index b3a1cae..b001256 100644 --- a/src/com/garbagemule/MobArena/MASpawnThread.java +++ b/src/com/garbagemule/MobArena/MASpawnThread.java @@ -28,7 +28,7 @@ import org.bukkit.inventory.PlayerInventory; public class MASpawnThread implements Runnable { private int wave, noOfSpawnPoints, noOfPlayers; - private int dZombies, dSkeletons, dSpiders, dCreepers; + private int dZombies, dSkeletons, dSpiders, dCreepers, dWolves; private Random random; private String reward, currentRewards; @@ -44,6 +44,7 @@ public class MASpawnThread implements Runnable dSkeletons = dZombies + ArenaManager.dSkeletons; dSpiders = dSkeletons + ArenaManager.dSpiders; dCreepers = dSpiders + ArenaManager.dCreepers; + dWolves = dCreepers + ArenaManager.dWolves; } public void run() @@ -104,7 +105,7 @@ public class MASpawnThread implements Runnable for (int i = 0; i < wave + noOfPlayers; i++) { loc = ArenaManager.spawnpoints.get(i % noOfSpawnPoints); - ran = random.nextInt(dCreepers); + ran = random.nextInt(dWolves); CreatureType mob; /* Because of the nature of the if-elseif-else statement, @@ -116,11 +117,15 @@ public class MASpawnThread implements Runnable else if (ran < dSkeletons) mob = CreatureType.SKELETON; else if (ran < dSpiders) mob = CreatureType.SPIDER; else if (ran < dCreepers) mob = CreatureType.CREEPER; + else if (ran < dWolves) mob = CreatureType.WOLF; else continue; LivingEntity e = ArenaManager.world.spawnCreature(loc,mob); ArenaManager.monsterSet.add(e); + //if (mob == CreatureType.WOLF) + // ((Wolf)e).setAngry(true); + // Grab a random target. Creature c = (Creature) e; c.setTarget(getClosestPlayer(e)); @@ -161,7 +166,7 @@ public class MASpawnThread implements Runnable break; case 4: mob = CreatureType.WOLF; - count = noOfPlayers * 2; + count = noOfPlayers * 3; wolf = true; break; case 5: diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java index 1fee336..9329d78 100644 --- a/src/com/garbagemule/MobArena/MAUtils.java +++ b/src/com/garbagemule/MobArena/MAUtils.java @@ -210,6 +210,7 @@ public class MAUtils } } */ + /** * Creates a Configuration object from the config.yml file. */ @@ -243,11 +244,10 @@ public class MAUtils Configuration c = ArenaManager.config; c.load(); - String world = c.getString("world"); - - if (world == null) - return ArenaManager.server.getWorlds().get(0); + String world = c.getString("world", ArenaManager.server.getWorlds().get(0).getName()); + c.setProperty("world", world); + c.save(); return ArenaManager.server.getWorld(world); } @@ -410,6 +410,25 @@ public class MAUtils return true; } + /** + * Grabs coordinate information from the config-file. + */ + public static Location getCoords(String name) + { + Configuration c = ArenaManager.config; + c.load(); + + // Return null if coords aren't in the config file. + if (c.getKeys("coords." + name) == null) + return null; + + double x = c.getDouble("coords." + name + ".x", 0); + double y = c.getDouble("coords." + name + ".y", 0); + double z = c.getDouble("coords." + name + ".z", 0); + + return new Location(ArenaManager.world, x, y, z); + } + /** * Writes coordinate information to the config-file. */ @@ -443,25 +462,6 @@ public class MAUtils ArenaManager.updateVariables(); } - /** - * Grabs coordinate information from the config-file. - */ - public static Location getCoords(String name) - { - Configuration c = ArenaManager.config; - c.load(); - - // Return null if coords aren't in the config file. - if (c.getKeys("coords." + name) == null) - return null; - - double x = c.getDouble("coords." + name + ".x", 0); - double y = c.getDouble("coords." + name + ".y", 0); - double z = c.getDouble("coords." + name + ".z", 0); - - return new Location(ArenaManager.world, x, y, z); - } - /** * Maintains the invariant that p1's coordinates are of lower * values than their respective counter-parts of p2. Makes the diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index a28ac7c..55c49a5 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -63,6 +63,7 @@ public class MobArena extends JavaPlugin pm.registerEvent(Event.Type.BLOCK_DAMAGE, blockListener, Priority.Normal, this); pm.registerEvent(Event.Type.BLOCK_PLACE, blockListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_DAMAGE, damageListener, Priority.Normal, this); + pm.registerEvent(Event.Type.ENTITY_DEATH, damageListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_EXPLODE, monsterListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_COMBUST, monsterListener, Priority.Normal, this); pm.registerEvent(Event.Type.ENTITY_TARGET, monsterListener, Priority.Normal, this);