From 66cc2e47fe470d8199e3b86622d35048339b58c3 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sat, 23 Nov 2019 21:22:48 +1300 Subject: [PATCH] dont count bots toward player count, add playerBotCount --- .../redone/game/players/PlayerHandler.java | 12 ++++++++++-- .../redone/game/players/PlayerHandler.class | Bin 9979 -> 10104 bytes 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/2006Redone Server/src/redone/game/players/PlayerHandler.java b/2006Redone Server/src/redone/game/players/PlayerHandler.java index b1096c9b..df1092e5 100644 --- a/2006Redone Server/src/redone/game/players/PlayerHandler.java +++ b/2006Redone Server/src/redone/game/players/PlayerHandler.java @@ -14,7 +14,7 @@ import redone.world.GlobalDropsHandler; public class PlayerHandler { public static Player players[] = new Player[Constants.MAX_PLAYERS]; - public static int playerCount = 0; + public static int playerCount = 0, playerBotCount = 0; public static String playersCurrentlyOn[] = new String[Constants.MAX_PLAYERS]; public static boolean updateAnnounced; public static boolean updateRunning; @@ -55,13 +55,21 @@ public class PlayerHandler { return playerCount; } + public static int getPlayerBotCount() { + return playerBotCount; + } + public void updatePlayerNames() { + playerBotCount = 0; playerCount = 0; for (int i = 0; i < Constants.MAX_PLAYERS; i++) { if (players[i] != null) { playersCurrentlyOn[i] = players[i].playerName; - if (!players[i].isBot) + if (players[i].isBot) + playerBotCount++; + else playerCount++; + } else { playersCurrentlyOn[i] = ""; } diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class index 4cc09bff66ede9f00051781e49593a1e4a2ab3d2..fcacfa96a59f9e549856edfe43795613318174f4 100644 GIT binary patch literal 10104 zcmeHNd3;p$wf~+wH<@H|LlQ_>5&}U4LlOuCLD^Ko8VPHHh@djeT#}K=%s4Y)b8U;2 z*1FJIHCQ)lP3u}AiGbBwYtu???P6Q2ueE)zwtc?WMPK`>7UX@;y?3%8)Ym`X=kwr` z^V`nv{Lb$zzjJ=SJ4Zh_@+^R}5__cQat5W>80Dglv1Nbd|7r^iF?>g{S7MbL~vkJBK9}50c!5?(#KL+q8{5cnI zj z;`fs4mp}mLp*KhJSc;_}KOjS-AV&(h5h)6A>QDv46cj5cQ83&uBLY|^BbD|j?I~4I zMxn@P1?A*l#%OJm~Ns-#*$O)kM?9hj0U zwK7#lr|FD3B{f}ZXDgVYV5Wj|6y;n6vlPr$Fh>c@RWMJ%dD?frf(zJmbT9L@S+AoD z0GBJY)L?tN`sDG=$B=FY4po-zpN1W6Vc#KJDC!cZ)i-~;dsohZ3(v7wO)Vi zDrbC-AkXbt5O0sA1=1iG;`Y?X(_ZILZ_DpkHttYWQR%d5<$M(yQV!BBU)d($qvP1Ve;tBYDx!_>E=kA%~=%PP_GTr&01cxbDjIJ2+zbR?=A*uge(kUcjNi=@vJ_$nt|Brq4m!=zWx z7>U^{+S@kU$>!kZD0_xB#zVpAMZsi5+g_)cZjErE@fp&m5ZTgTEF86yy4RS!-Q{gT zG(x!u##WwkqB}fi5+xxK>L%o%PZNy(N9g1|6^)Z>KIIbHx;&V0m~`~KoGwglQ${Uz z+T+1hAa_j_7WH-aYq7|co{PPLwxAO2!)sV5D5?CgN|jn5;TVg~QMsK$?SV+jrK^^4 zN;2HLKaq@w>=c)kIRDhzNUvl7y+u1hb|M{#$0%JRK8;>1$aUFXv1)-}`l;pXEe4n(zn{DU~LYnTqVP{j$<8s|40SankJK z?P=N|<&z3-vlp}m)6Mpd^jgOoh@7Bo#SzD9 zT^!E{r>H6fg`R^ih{satU@V=oa2xhoxEXuMk2g3#Djb&87H+|<7Ouy~ELnp+mNelG zOPcWsOV(=hBAuK&t?ryDQ~7_ICF|s3zpS_D&l?1#juFJ{bZrAc6CKh{&ku)_RIeo) zP?F8!g$REPTq6Ps>e~d`8D^R&a~l>X+Lr z*-M$rXBB)-ZWoL=*-z@*Bhj!;6B)jQo>ZZB60X=1PgW!x_o}eu^FkHeDVzLqmn9vt zkEbk;;Apra7Ee3)4!VWs@C{4umM>U%RF}I)!MzIZQ&|q{U%1bqEV*CDAJDz**V-2e z@F_NNqxLRN4I5X$>pm zhlTx;awC{v+^Gz4kkirM`lqeje1#q2Nj73|lpS!s6b~er=@(>GZm3sBx5AMWqhO3w zG+O#w-SEN_z_p47cIHG<^F!&#HlCJQkrYpK9?3koo9JvjD+Om(PHK!NTWW)eV5rru zZHvT$wV`-hTRc|V5cjZn(p7vE4tGYfYj{*Kg1gR4&m?hYzv}FR9GxVUjXung12Oej z@J5JN+(%(RzZ<=l##0$Y;$=t-&MNZzB(yjgZzG%bmF>Z3s-YzoPudHDDGH{*71yFG z+arlKCm0(W`a{=(V1hW)2daW3)5KG0MKmU)YD2+PI%;nZCR4Sf$?7^*NjYps?X;~v z+mN=~*z*x#o?0CQAmgYpyCft}ne+YQo;^TExji|K1oS^-OKuJ@WO^IGjl zOKZB(-eyO=-ldHHt-%x%3W{Dmvt6B!W^j_U9rus4C8D*f>~xB}=A;}NLm=mvb8QSP6vN?I`ocbUQbkrwyvV-yRma9fCpFWrmjO0Jf&8->8s;M zCDif?CU|aSSkBzeJ#_LDNqZn(LBic2$_X>mtD@Q%P<#(BGmBxhW;R%*`7! zUR4;P-jie-I`xtC z{E(Z0=h4E{UlfrxyFD36+Z-n4tjY#w#*j7kW=&X_cq<}B=uM$Cw)0?##1^tU$V;AJ z)L?^jtak;oYrXM!*A9~Dm(qwn`~g|%9JSkG*8+&`Zr8i(Ws#&hNr9Fz<%i6+1rto} zH`JeWW@T3Qa%74?d$`G9IK0B%?p!41_c5SHe{E*UDX$QjgY0Bh3${?Esn!8P&EDL; zWs4qu0auv9Y)*!u!iymsE+BnGgWn0A8A<>3rE!9N4kd5%**M?1~)R2 z8hqJU!`K+1r&24ljMI&om6xcvN4Vm4i4Kyu_XyB$BYELSxS5eK5l?FV;RZF=GENf@ zU8;@|6uTQZnR)MFVX#ImS5GdkV98)rx$9QEx}nQ9if9c>_g-!HGbd$dKxsI zWuB~-vl_Nj>12B-jd6UpyN*wC0p#kHjkR38R5>MYDNf0&l~XdIcS>gWPRWekDVg50 zH1t}?a;V<_SXvOhEfRi~twz2>@@j_Cs;6L7`MTk&dK%{XqO%IWmh%*{x{>`PM-62>qPEupLCvhW3+KUvV4zLS9K$|dUQ7eL>pb*q_EEHMxIlt?t;Z>L-RXPQr&|g zhfyHB9u@YWs0Ty4G0c3FYx*31XOm-~g4~az9M3>G#$znbWNjQOaTX>M)}jh$qZ+eN zgY((56jKnxbZ2i>>f@p*$I zRFytYrVWEW}hS!W=BYVqA#j9BU#} zV;N4q0%&jqs{3yC1ggTbkaY|JzNuzYc-;9z==An;J!k2DD!C7G`|N&4;3txp8$NvU`V;k z&BJ))pX0{#xbdCL%|=qbl-yiKZZ0P`8_7-RpW;UJ5y0if|CVE-Fkhe$%Bs5H>%f_P zVk-3%ZaF1gD94e|Z!!o*v5R12J7pL0_944d-gR2fVf1pZn|@m7Rm*F-FlI_o!O{CL z{G_fI?}xwU5XSPaVqM=%Ngs0jUTy3QyBOndzelahvAGHR5O8>wm0r)p4vb;dYn@d` zCRR-DMPPCdDtj>L0Ek}At=2f!>NO_2t9g^Abfea(dhMy*YVcgoYu9ySx>r5hydT4A zdN8BL>zLVtbG+)gIrlq!d(Bw`S()8~Ih~l9!SsI-Rhhc^z`zZhJZr9l=4^^W>cGSU znD;c!TmKZ!A9_I#=6h5|u-b$A9xUj@_yH&jPle(x{S+4IWNGTeEQd-D7I#pYC;sZS zmU!h-uWazj3pVTCpK0VfV3#F4`Ma{);N7-j%zpB2hd#P`+e&Tx8IALDw6VL ztjP1k-o6vSIbbl%TYK%mbxyqeB+s%&BgdGFWk#Mc%PCvT<>o3ZGaoa%%|lq`#vVDs zunV*jKf)+<1xm1$!9B{8^a_UY1ZLt&Mwuj&n{8N&?bw7JOqF)=sq<>4K-V#NUyrXd zojS_U{TiRCf5}(sH<={8!w1sixJmNy87arjG8wnXEZiy$d{|tI&+%p&lNAPRkH}IzKD1PhvA%5rk3*It|@dvXUe>BJAPv%7Y*_?*A%~^QIT!g=v z%kdty@HcZc-Zj_au(<)p%oZFsx8ehnUv|uP5p$0i=FO62-YMDU!{Rp|lYrSR`Q{K$~RNHyRY^HBcwBmwelN0PCSEhGw}qz z%B)}tW$RF(OuV_=aUPyjdfaQKb`ZSc4juYOc&QO24*vBzo@1cBWem6HrDYlzqqC_ zhl%p~9$ccudDX;N@0)3snC1Jin_V0BVNo^9jU^`i{ZhuknO=*tFY~HOx(AnQt9m`j zTw-n_8E=q*W`$u1qx`)%f0SQI>JG?fsY5v@dlw1kDB){0 zuCaTRpPXyLf+4KexZH+zXLE(eb;BFD__^BKg^TXR#G1k(MdzPTPI?e_u)AP;!!(pF zoy=Zzqz5hiN$#hqK*%uUNHM=&m0+k0$8Z^m3Ms_|DMOWv#&jMP4KfDJG8UVqf}iHk z;Fq-VJPyv}Q7{2tmWg#TU7%nrVOwN_DGD{}O zY^jqu?3pW#avncDULegNpHrrLXW%yrXovUpp$(J@gIuVaSOmxGs?Zg-#uel?EF zeTB8BaEPX(eTR7j8svT|j*yDaNp>rdUvZo}l)q!eG@9uLu>5#h=I3?e;+?Z>*F*VsDoOlp9gfmT5Ys@z@t0b$$+>hI68S#Bs%_32f z#r%?ug=*E>>cN#Aj!|oaYbL$^%zDI9qmDU79rFe~qjssKW@fWHU6Sn@b@u6vI*TS3 zci3WJ7{*D#`xwIZRG)7seU4vo-QycCl9IlSG*S;cvhG8@Id3%eP1`w_#b}z2 zrfQ>U({9G3gQGK7kOJO@c5-5h4zz2xK|AQBLtWLczbala!2~6T->ir7ll26-1(k9e zrg0ZD_`!NU`RGM~!yuaPg_ZU4*$VU!e uO$wPJjO4pg1ej}!g$M}Z?eluetk2Ev*E0@^yvT#}K=%s4XvaiK1# zt+r2Xtv0l7XpP0KViIuQX{EN-F0adXCpHfvg+VSIq@YMav4X)0hFCH*h~-kEv`ckln1bOHii}V& zlKjgkZIvk)t+VC%Fl7vNAY&Db)3xKZb&9qoC^%K|CI)4aOjb~lPcTI%D)XgEs&#g% zu9&8zYP2<7!3+hp3T7(GX$od3n62P+C2)p%+}3$%Nt&Yl&NPf4A& z>Q!V5gR)2#>+BLsmRhpRk_Jnb3#?=;w984Q1?5{BQ%)oicWPQfZBC6pUbDuXpC>5r zMiwU8;~9Z82!{AL3)@pEC!UGzS{)Y*-O_k|Xh*0f7K*pjG-XoJcncR7wI?H?j8hkn zb9vZ_kicd^p*Om&Jsu}oZ@l`Xn1>FEaq`Wv;vPz zeJl~)E-1+!qdgOiDF;rdjU438kH({!GX;T)DH{al!bF7hiW;MFXH|RKRwvaQ+8X1? zkj6wf6x$F=MYZn_nwi!pH=2+oeF6zB3&kTbC#7eNJ3Bqz7RI8Ki(qWU2^V_P^QKS| z5~V7_F8U0?=)Z?f-qW!JsTNW$;q5C!Nta1itqt^8Dwi^9aWXy+p1yc$YHYA4DQ{*K z)vVI%MQvClD6ROo`gCP5>Dqy=Q5l^;#ldLWqpMbMLNYw3l}shVPMX_Ff`4jAq*vOH z-r@_xPBIfs#3@N5F@p{&$oJS@wPvAU=80wLZ9Ok5xc<6VbsJHd+_3DdtG;+LoUU1w z40E4AGL|}-)P2H4N@s{{Var{mdQx}P(s9synmQ9vywq=W)W6Qa?$HwI(iz~6m z#y4<}0JeM@_uANp>q+WFk;iinTRtP_*%HDPmTa{pED=i_Tejh5OImDcm8dP}<62v` zE5|VfZF+#XBrHkVasjTlBxOrlGM2RSu(HFFowi&kyKK2g!NrPxiGoWN>{jqu1(zwf zTq#~5SK6{iS-8rUtK}M7KBse^S8%OdXUP|A`69(FDs#DBZV(JV-bL!$qp^rX>ln6_ zPBczUBr+C@?|;45^CWqax;S|qirlQE}qD^_%6DQC-Iamx5!s* zd{ejUP_S3Q*Ho56`!??NC0o9(^SA0*ZqwH71h|G>T%}`oXzTNoBHVM`sVMvOaCgbw zwtPdo_h`3M?zQEcx?;bqu;o6vpMGG=1M;9P4=MPTVm&MeEP2G1F2(7V9$OA7g+p?{ zmPh3=TOQZ$6H59?1yAY9r+FTEMxM3hIqg2LgkI2{UR3M6PY&DiZJqdzQh7;^*z#Rm zZOO~Fd`}{_d|&Zjksny{sx3cMHh*+d!^*l~ai65TL?sx1B10VDZ*;Z3WvjQI?}Qn| zh7Zi0{X$Dge}dU@K~BY%di8NT5=}GN#YshzqSfkU5jwwT6%8EBi>B+sndlA%%A9Dr zUPFJ7F}sO=#xN;3wPH$RBGpn8N`}I%PEA`h9;yi^+S(HFnudgr#UMBClW=%4l3m9r z#YFA-F+G#S-SeuS5Abo4R5p4sNA$B0QX(x)JnXkn6B}w52uE=M>9B1 z+OGRY+mf-GHBKf?Uh~o}raJk63^)*xdnQ@&u1_wEIU$lAcj5}jOPBK+G^_+8?M{s4 zVWyo2F3=9u-)9etyaBwX<9Ljw^w!1 zM9msr542?ROY~4O>BK3FsV6Ez`_+hEwDuFK$}yA325?XP14+AOCpU_ntT3g-O8mlf zZM)O%MAopdrixs*W7Rq+$tbnPt6W__Dy5cJv9|Lv!%CKQUeGB_rkwtGMM>{~Bu7gR z(=`jUqKk%NtRi{PU|)|ms`gdS}!*Kje}(Rq%^!2zh6N*PwlqE zvjAdy$MvstIV7o0Ql!tg@Nr zsp_si+OjwviK@eo@C>7wchKVvZbURa@Sd@bxiLylrB-MeCz~@XHmkUYd*b$p4v_dD zFKhMLNI@hTX=Wx&CQ@2|^i7{MA9_?>BPj6>;EnXzf&czsphj&^Padvd=|EL^`(~5r zKcp}#gl$FWU0?%iEgU;(f|} z@=E1CS;)IjR`u?amAw08Scw2!;vrZ@g??bZ#BM*o7fY41vh(?WjL`-jwOu+ z=9%Tik$o6{09JYJVGMGgUC8S|UipGf0H}b1ScOyu&(N#?f zYt3#HxQ(hV*jzTGuoI^2OhX(q-LqAaf0OvPP@a17q<>0neH9%%r$OAk zoHg(@&QFB(A>ZK12=fEvU*C z@mzQGbVA;d2~|=1$%?_};=m&)3Cu53fzG2y$|%rD2T)q(w!1J)1y)wuh2eWqN~-30 z#P3vLmX-|}(X>Y>>K9d~o{T1u9bg`b&!;XIpaf@9I%iQDpTg;=XKy|hVX-TZVPqhe zBPtJNd$BJMJ$nJnqsW!%xjZ^a-i5n;zAxh<<-3ABle4GxVXU%3t_Qo%${vjDKu+2H zE@y8Ted-&<%|L|&(Lm!}jxkt4WiG=ctnOvU@YSR2ROsskK9!vy0!Lv;xyMZ>?)}HO zF@0_V$8*z6%InF^26D5J+%%J$E&mWVqE~m18|!V?z+k>WA&jc*LZAbu_KInguUy-G z(gE^Z3B8#`FiJcGBiDU)p=l7eSY2S?!NZ?7$c{{obTnGO=pvVFai4 zU~&&C4q!?bDtXkZ4h;c*r`p@iUo^EF)7+-tuj$70{{0!c9nT&{{tMq%JVk&P!v*!dfoiTv0&3doH^vI z9(>BDGK|e0)b*gg6BGKOEIbj4xAj3R(#6u$i8(Hn9xU#lGLOCM_m=q2rT%l7|7_?) z-b%_~g__2PZ}*x;p*w$Aj=9gQX}sh1{@*nIkD5l-OdI!NxUYZD#~B+MJKg+PR@;MB z18jmiU)`ahcFkTCn2%r$|JJ%=Wv*+la}JU^Gv;HtQDDq*pDpG}a}Ac8518HNAx3aF<;Y`9n!tI)4>4_Q zMJd8e%@Ib@txP+un2jhS{`o9T;*7NkVkTL@q*%;k7&&(`;a-TRaS@L2+t=&-V);v! zNN=$;`ZF%)7sD&15PPH?SIJbq!=8g{qye9o^|)3XTqjX{L6Up{ejRS$JJTEaHuOt! z556J~;b!T@7g$kz zJ5Y%41V-RUpaS0woPn1E%kaHGGrk{);0J*uUJYD^9|rc|M}h0`lfXUrX`lzM1s=oC z0?*0+scg^kitC_%iW;@arXQlU)z zwLEbF9#ncfYqoU+o4he2DZlWj@H9RZqrn*BQ86FQj+xi9sPoGd^M!t8%7vJ56ooQ^ zb-_`Hlpn<$)@A{-X5#R_VZ|h)_9$vOF!losECF_|#b6In*uRe_7)y2#i8yL(tRu|{7%ssmYoAhyJ z6*0~Z%r;BS@_pFDq0M`-xQfp$r6&FT9Ol8&&6ecX_n>`Te~kbuGoEJGr20NHcj$TokLoi_L!_4FFAnFTyv!P z)a;zV?A+4a(wu!*JJKx8t(|L)v<~B}k(QFw6OhkQF6F%3i%2+63Gddt#^I3`IoE;( zgV?V2xZS!ZmpeSD2j0xh&(P5>tiKJDs*48=KI@or(u1&z-GzuhO+#@yS-t2?54QEy zw%1aDkOJ_30r<_S5JO}ThDkBT$q-DGp{SG+%#>0z$S^eXzOq$D;1U^y&q*2U_0ibJ zFmkVq!Gpx>l2h=COu&!jRQy~f;(eJcIWk3x*pNaHLh_@)Wpv*%N@(ZE2!hxBe2vsvbPPky3kG2(Xk%h z;S6#=9S7Z8i59yRC>-}8Pbh!Gsu?uXk6>FkB=R9nxA3SGypP~}$e9%gkj7(KBMem2 z2z8&sDn>OzH!HB(W2P8I=?|+ePW7OL)m2k*ZENwESPxpODBvisUFXv%d$7IAQ(LU6 zoEwyp4_N&XmSacEhaWzPhxy< z*TXp1YcTJ1Xv);Vs(aL8wOC`P3;i~seY<;j_I*l~hr)BXHa^7f`*xn$qnqA%yonbK zw*Ge}&Xcuwps0$a+#&2xxwiLN{d1U3t=7@%>oGzWVvH<8l`O$@S&CV*40D+f>t#8X z$_lKIMh50p*uw9>VSfH?m33&7ChU}Ee3{nPAscYFY{UUM8!yXdye3=l2RRpi<`>-e z8?fMd?ig=V!(zFNU`<*_X$7m!W4|#mwVY56a!6?4kC}aE`#pqP- e@~Ll%hH*~QvUf?(hjEkvnYorz&v4Mdv;PB0BpG%9