From 21af13bd31303c20b1ebddd713e09835f5acb03a Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Thu, 1 Jan 2015 20:17:29 -0500 Subject: [PATCH] Fixed team not being assigned. --- Release/Plugins/RenX.Core.lib | Bin 67706 -> 67706 bytes RenX.Core/RenX_Server.cpp | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 6ae2b94aa6da8696ed40c983c9908a0e757dc9e3..a371f72810d05cd180c1187c7da8028121bed0f8 100644 GIT binary patch delta 4350 zcmZu!X;hSD6rL}K#1)Kf!=&~fd!}!MK65}UTLB!S=s4Q z65wVm6N-iUP3R7Pgmr*(D|;G65HoxALaz?&bv0xxH$9%KWBmSA_p30)s(T(=N3OnC zl6n0eSi72yrK_JbDhRjyRRU|YDk3$5i9;~q2&Uok81OEOIX~I#Pt*HTnw0uyVg4eJP_W(P{wQ+XB2t- zG#djOhKo`1jVN&Pae+XA#)cl3(csX0M!P~>@O=MHu&#escx8hri8r6)D!-ICrSJV4 zxnA1FA*x<>naaNLB?G=7eYwy<%3dvnGGp0g-5{c*BXNB3t2q*xc?gZ0Ix@C#h%MIT zc0qK;P{`V$=T%%N?%Pez8*zi1IoUIt#YhFtY-ZafMXzaSMU0}j=q=mO4brx-*Q_n? zDkDXf9%fryafaczrAdc5>>>Qqe|K?o*~!4%B(zx|7_BBW2GS^;5p-$SXD#YYoIvZ@n?q zEX8U2ZqsSJMIP9;jnkBG`_Mr=e>>w@v|S5e)Eluw*Q0I(cCcsdj+p|&FfRC3jM<7# zpPg;#l>K>~0>HM)qE-x%;{{Vu2AfOE;zlQaZl#=xXN6to6zmm+~euKLUY*-a2mJVsPxtjnGKL@abU zs7ny|-KUuJl!K2N@+isR%t5W00VeZ%0b?v!>-T!TG7m9`+(R>hs2>*U5@k1SB59iS zPMfCr)mRQ_@;74a+i zhrLGrsKu79?fTK~T2VI`RKa^Pwql;-lB%rogNQf{2fF&HVKC^ZafA)6R{bPe`4U4c z7HdM~Y(x8BDj7y=rLJo1!~CD^eLz}=)sqohrN@lsb$ttY~ibzt873tTyt6 z1wFE1NK*{doV`K+A2Y->v99q=le7_ouj*z+XgGR&%pM6ra><^&_piApxQI5( zMUdAL1q}(I5YegylvdEozoJFIS^;%ThW)2c1kD*{Viu&=V(!GEp64fG7Sz*E5#y5h zyMr(WcYX;aI=U#R^YmWewu?Wru^R-%*K4D16_x?qe3LcHY%Q5)1S&8TIrt|DeY-fq2 z^fQD_mF=wI#;m9xiN5h}OMWE+Nv57PpWkiC2I|+-H#NkXt-?t({6uFK^ohO}fuvlS zxU=%e~m5L+mTP*qUdT?#+RHFffk-Ux@O3(%#Zj5|`7}SJB?;Oi>N(E&a_! N=6gbwIXTqo@jrR8SYiMG delta 4350 zcmZu!X;hSD6rL}K#1HeHB-?REh@lctEth^la-N_X|@;>_vCau znPKiis3a+3Kx(MzIGP#}0Scs17FI`z2)p;b_x-+?(VtxI@;uL7-fvpG?iR1x8yPY% zZqUGi5SQcGaNCe1=dS`tdP@HEt?yuYpxe^$PIcug9t^i!u24wLxuRg?(mKlyxaNYo z@`8tRE_N&)n6oULtlnjPwKY)afg9F!K`S(VrmK-LUm2$?zgIGnasP7mtk*^bWb0bC zrmPqyuD$m6V`PI|E|(i7t?Uh{vo31YVEq2o_o*<&s%IWsN3FR> zl6n0eSht3arE8uvDhRjb!jNxbj4oZor&X1U(S}u%tL70+?lbBM{Kb! zw+o^(hC$X&J+IZg3&nOAHo)*6JP-gaH8 zS&GvR*sjxfi#)J>JEy7G{(*yd{tm{oc!w6is5f$_u1DPn>}1dSoihZ4VO;Qy7_$|f z{^jlIRFn%2l3@BSB~ls!Pb87z=H2fg2SOUTTdnbQbh#6`mG+-xco?(Mv|G;xg=Oqv zg4uhr9D>+kZb=HJx|^zfGJl+r%Zp3?>$en^z4sBVF4|ISIn_IR^)8VkUKbk3uzh-2 zNvt{hx^RI}SYRX-$mui~D);GIN7qzN%K*Q9TKsB0{i#w?c6s!EXP3DgXQpE|n%1`| zJkKg_X#FF<=~@+JW4V+eNby=fXVz$z!(eG_MM)u%tH(!_t5h})DH`FiL#qEku=SE zr(M(h>aG#Vht-wsF>VdDu0ERiujfM z!(O9)&|*v1cKu*?t*8eKuH-!#S2?@ZVg66{J|L~b>dA<$)?-HVI{PSxZ?2xEbE;vSP@}z!k^Q;G z9$6(Qv$z>qJc}$+hh77dbG77Y|1#L-+NZUMPBrgQr<$`5$L!?CIJEefbHIB*avcjf zy>6Zcit5VM?NcvT7l^#P3DxzQJatRHb}}367B+B^)&}#cN$5vE+o8_AO*pPSrO`)@ zYssmAy!t68^s8@dOZ5r8Eym1E`Nf_&6jPqgu*UI1k33&(WX|43?J42*@XSWp!y<=6 zZKE+fAktU-s->sRmJ^o#n;w7JQO-30TlgC0D!Vlrt~#lY6?x!y27AP!#~k#io^}N+ zvOS2Sj8)@Fdtk7dOyw)T2T8=a=riyQ%#|@F2I88`YSaEu)ow(Ox#+QEbRYCExfxQs zo3zx1@lD%kkanNaq{%qr6p#FZQ|7h8uWG(A^i{opj!5l?(QwC~dYXx7#-GY%2)ewj zTq40gIRYZKTn65 z(-kZZz5z^xTAD>}>4SQK_kdQ}Sdh%qdddmNrDv4%!!Ygxls@|Q-Z17&yk0gnqWt^j zCiKXLq0KQ+d*)jGf6Nfm%(})mPtryVlBZ!$bCB4aiNyX84m3wW!oI#*K6P4|!}a+8 zMZ_VlXB7PRk8Xx=;90sKU3>^Py=yl}Z_#Zgy=qz%p%Liu5ql&A$t8R8-oNIa;3C>A z7eiia6f`A-LPVPuP+CDR|H@YVY6a9W8UCL>5j1C*iCK_dOSlt@`<$DISx`?uL5xe| z?+U^g-1()H=;-30&eMB=-;!J|6?1*6ysm=1XY~RKA}&XWa5b zg&WRZ@tEr~^tx>3b+|8K#v(Wu%-3dF`h+1N-@*$l6+8xmS77k#GZW9@P3PH{*ufG> z>1PO=sybLBj9F1X5`7Q4E%}uQB$;~Fe15kj8>nAT-_#ImmI^1)@DrU`&?ovj1d?)j zlCLDhGH9TeFZV)=4zaKFLTj#Fx*rGj$G|)ad@;)RaYsu}NnB2MUu8$DD@8SRwDdO@ NnePr&=HyVT*Z;YyplbjC diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index d13d770..0967791 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -667,6 +667,10 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { Jupiter::ReferenceString idToken = playerData.getToken(1, ','); name = Jupiter::ReferenceString::gotoToken(data, 2, ','); + if (playerData[0] == ',') + team = Other; + else + team = RenX::getTeam(playerData[0]); if (idToken.get(0) == 'b') { idToken.shiftRight(1);