From e110ba296e6d1aea384e5a91204c61b989b9b41e Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sat, 23 Nov 2019 21:08:51 +1300 Subject: [PATCH] Exclude bots from player counts --- .../redone/game/players/PlayerHandler.java | 3 ++- .../2006rebotted/redone/game/bots/Bot.class | Bin 4330 -> 4330 bytes .../redone/game/players/PlayerHandler.class | Bin 9959 -> 9979 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/2006Redone Server/src/redone/game/players/PlayerHandler.java b/2006Redone Server/src/redone/game/players/PlayerHandler.java index 6816c4a2..b1096c9b 100644 --- a/2006Redone Server/src/redone/game/players/PlayerHandler.java +++ b/2006Redone Server/src/redone/game/players/PlayerHandler.java @@ -60,7 +60,8 @@ public class PlayerHandler { for (int i = 0; i < Constants.MAX_PLAYERS; i++) { if (players[i] != null) { playersCurrentlyOn[i] = players[i].playerName; - playerCount++; + if (!players[i].isBot) + playerCount++; } else { playersCurrentlyOn[i] = ""; } diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class b/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class index 626ebff0af218563b56c93532d239cb59416aa62..a0756b4ae04dd86950b84da9b6a3cc52d99abfd0 100644 GIT binary patch delta 219 zcmW-Vy-vbV07lQnHe7BiZ6HpDkgoN2GjV|d5)kAkQ53@HVxlkL#uGqtM|Q#}r4$lZ z6DLP^N5VUp*fM-4=X^VF=S{wkCGV1jqDvrID&~ZW6ss7EZOzanvv?>)#uiFgwy=e@ z9GYLU{z0a{M&gd?rQTz{u=63iF=fJlQ_Q7a#s`zB0IACfplguTN;(;$Y-PJ756;h;Jp@icKS2((0 zpU>aywXBB`mhUVHW3tBOzvjM4wHK)LMT}>bzDy9FSPSx|3Z{~Ggq>K7U$S-oco0=DHi8J;Q9q)dx0FTC^0h>q_0!#_tk BGXDSo diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerHandler.class index 484713745aa9174ebc0355ebaa7a6227b8e8d501..4cc09bff66ede9f00051781e49593a1e4a2ab3d2 100644 GIT binary patch literal 9979 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 literal 9959 zcmeHNd3;p$wf~+wH@V5=h9r=%1i~VMAqj*4##*(CWB{$!t!bsUYTMUZyS=_@*Y~>nsutvZ&%JlDAk^1C-{U zzwBWwIQqf}eJQt)d9ztIJM8^rJM`$GID{;Lpwz#oJ7 z6aK8=FN*S41%FfUmV*CQ@OK4oD|klzK?+I~lqx8*WN;9TGK93HTze`M45d6|n1bQt zUq)!HQo%?a9aRWZswjRLtzeAK9jmo*T02d_c*Q$CC=+C&f-?#Us&!yeq0~sNj@Idn z$x3R9*6I~ZRWMD#bVZq=;7kQG70glsXDK*a!EEiDqhKzZuEu4aHs|Z;IYBvBKBTn< z71@HIER;n$y4aE>mMpbonI(+^D;W#za#CqQ)uyJD6G_CK`qogpQ}6fJuW`rc3W~g* zg^7-MMxb*C`#1|bQYj~%iS1e)7Yy0dba7~Vs6G~ox7IgjQqg!TCzo_2BcY7b5RY?u z*olz91%hI)cU?z3PPE>3vlC9lBV@^+)tm{XGA+?|hqIOo25pUow>HFL9%n==^2jWR zCBj<;<+*KiWTG+UzzMaJgZz2Xcr(!Iu=9UgBBV^PXQFsAyX6TRWNlPC#^ zQWaqreVSm@KSL+)=~#kPiz%1z)|H{8%cQH;W%O7omojQ~GCmKUzPM{@tjv>?H?oRq zR_XPkHZBrWRKH(+Iy0Db?Lg z@y@W5%tRA$O43M7qk{?xJ+@b^Styusa#?yy&&>(0zwTAtMwBKuG&kz1FP;pi>sKYi zTqlr>rA{SvpD>Zq86uhK=x)c7<(8}v*!{&x6H9btXm6BHI<(zc*cQsPI6E`zUCSqO z%4tt*cRYHhvp<@lH_D{-|gtMFM{R^#KgtkLFLom@C=`dL$^@^_jo z>!jI|7F*T}`Kxq|Ans)98wr}}d`_kz5=l|Lwrr5|E!k+(%Qx9_A?~wr1IEhZG06^+44F0yp0ER zxi2W_RIpcNIizplUSG21HXXlR_i~5U?j*n`*u);~yGv`=P>OK(b+@A2qnq0&U$o_3 zZQiHN`=!g42Xw}lWVtO5%9rT}wmc*c+wzEluPD}|@|Y$2ZFyXA4oJ5xS*37L9<$|; z9Jb{NZ9b`_zpCIVo%uBPBVUteYy=j5^xE+b6dDz8CMGr-*%{xWt{GL@bva=wXZU|?h+Z|4erWa`F z4>D#q)6WqE&gNM|oFtWvUd-YBF*PFiBg8B3rO>b6JEWE+(m6!pR)_8ApA#G2^te=L1f2YISt~l|0VUej?ROx2Ho@l%!71FGx zFr(#$Xr|56k#@TY)))%-WW4zZRMp6TGOXt6=$YjB>lFLQ%}#2&MmCGeujkped7|qKA@6Cr)8ZK3NjlFGuvEwSS6%5F(M3ZsW|7=zu&+fM^0G;KnU^x=ys9)zy{EjsC9zN|*(&xU#Of_u(hem$ zG)xg@oFyrS6kc7LNqs{i#Rbf2*B**>odwZML)c5ci)dl$FN#Q;-I0oB91fFmUUj28 zW6(NhvnDLexfPKj^rui7I~Z7^@kQ(o@h&GAG0-4g>s`gfS}!*Kje}(Rq%^D-zh6S? zX~DAqVtd>5uXK4NsZLU&WnB3ov+bcI^ZHE-PKa5#)&2CCBG4XgG8Boda(1|Ph=yJU zH1yZ!rkwQlkPBodvRbl*GEKMj6KekEjxAd>_ys+A?#k%(%Hm1yiF62U`~4a!>Zdwp z>h4t4-GXTA;&>#g4nN#8j27NOPc*pU(e%K3#yXyjQFa_IFQ zUkyyX+-sKLj1xlWKn{Bm8KuVe51^+&V=VJ!wUX6{lg^|%!WoR?YusggXe;C|Z)
  • _YHowaeO#u=DQSdSWlk0~WVrb*^75k=Zaa=L1T5Tc;SM6R!@`|ZN`aM|7ZIsTC0H?X z@UZ4RLixU;iu43?8VXpSON#TT!1*Z0ITXpc6hQ;GK99m!FN}jIu#C%iOXii{YKf8~KpS)z6JSeN}QX zU@3LAjMmzS(O6FHEyYBv>Sf39^`Y!k>w5xAWhaQhQ5aI?adSVq{xxn)pPRsm+%%JN z3%OZOZq6e&&E)2Se~BB>ySm4X^*h(1V7@>hjHo$)KqpS`6;q|JP1`ML@dd7g-pC;s z-r(hMv&%;@z<74xx&Fqc`-< zl*}PjmupF5opOx3daL=9>bf!6t@`aL-Kg*1p4yFR{?K&uZVai*Vn&_cab^}X{pzfOyWQ~O zH_z(N%Gp`W?!v4bru9YCS0L-CeAh=n>?n!7ODrIN*>PAc>GTYhV?UoP>>rGB}r3k54FgXL-( z$9~sq8pZB-j~sW)oN4^oZT-J#{2w)qoSClJi($V0o7|GIVMUjFAdZ}##mWITL7lJa z)KI&6FN(~^v6_Et+`f^nYp-?oV_jL`H*HtnawiIENGg!CBH#0RTyg1H;szKD@zjM;A4YOXZbpwWET>^2WEg1g5JAN}Ht&>toKMLae_sK92P z#bHL$5RaTz%t9M+qs&Fx8E50fO7Mkp8}pVlkG}1U?>q1{?7|U#?0TJ_D1XMB=uPHA zf8opWF-iA;X}KOZ@+I^pzIWa%_v02m zSKi9E$Mt;B0&=unaE+TJY^a1TP1YcqMQJUJdNQcLUes`+@uMgFqHP3_O9?0?*-oS&zGblF`U&ces3Z_uDE)~kepUWK= z;bEo6z2<61u+i%?lJZlJ3U}jEF&d4*9u@O&uFt%YS)8Aym@o88Q+8t7Q54H?<^@L~ zQgsxwnT!R@`U%7SffW;t=|?f09b?`_S@CgZhD_3K=cg$Pk7yG2K~qM*3u}RoJA|~k zz;eII6aOoC)I0Z$9n5SBncc1D`I*loyQQuN!|F;KvRKbxeqLQ^0rT1oS)8xMIkm*t z5SV3Fm{t3*hg}=@VsS0Y3o1JG?frAxUWe>VviDB;WXTx0hLi=1o1fOAj2an&8B)&A{uOAEq1enz%B3=b;i3|E%1G>!QFwr% zka2ifPQ&+QJbo;v;~kkOc~UKUP4>|=mc0%}bj> z?x!N_UPCn5tw! zkBU)^&^;B#x+g^?r9ZT;G?m2`W>@Po)x80W^r+?r?#!NRcvrd zv1hr&RLhO2$(G^xy(l1@WvW_ZfmwMKc@^e9+(eA_y;#d4UXjPsg^fjO)!ND;(dins zHn?We@6WAAEH&zwYt%7+&^Kz2+O}Ew>`qnWdq$mqYNO7h$t7I2D0f~@Vl2374?gTw zcHv~PC}&%RHq^-#DE*Tx6?ZQst*dvwv8Pc-qOGV6b5;@nxL z6D74wcG*%Lcq88}XW4fIrBE_zOSTzAYcYd;Ab= z@>6W7glYc~+Wi)p&rh*yrHxj9v4mtRd)p;VoL&6Tf0-oZld_E;I8*$tndaBL4t_4& zDf{ITIV_jTGsO5hKewv4T*wgln(r<7ykg(tdP|)4e3tpse;NCdpAohNH0PKAY5i^x{}^6yv1iT?}G-Y9KI} zKF5!(Uiij~q@+(7P1M8oyt}Z#oIi^CrtO@~ViZkBQ?*gO8Iul<%3VQ9cpKWmiQDKv zJNFp0gC086u0H+M@QMk!lKQ)feC?sHUyW*hW}e2c%roU$G_Zduzb~(l8(cZ*v&1z1 zE0=o+bMAasCVJ&=%E^Q^FM{;m)Pqu`XCMR8)4AIyvndS_z@*a1Q`r4DEPYzg`X!H} zA~3g7pBPHGl}c&e1M>anKAuNwBq0w4eBfZ59Oox U(hFf6WkBXx%b~Ba)4((T0~%=&X8-^I