From c00f8eaa9eb15f4f6b241391c846717662eed700 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Wed, 8 Jul 2015 12:02:44 -0400 Subject: [PATCH] OnPlayerDelete() is now called in wipeData(). --- Release/Plugins/RenX.Core.lib | Bin 129390 -> 129390 bytes RenX.Core/RenX_Server.cpp | 11 +++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 5de161ded01d16c63f92c26159fb8c197b22f3b9..ff6e62f690ab439f4831afede8b4ab99d4637dfb 100644 GIT binary patch delta 8375 zcmZ`;dsvoL5_ihYbrTUU;f>JDG?4|eB2q&XR8#`Ip^^e#GOvKJpocYd~`QDHE^E+qGTz)h2J9FOe(v>!s zuC&SNdE21SkU_yAs(A$5QTkBNE$+YHN!#)WFVw_>uR1aWyl!MnDWNjx>wChr=kl zxT?l1<`0K>yNJH~s*mcR6Y20D0kMvqrccdI;RuL!+i{unixlk?qyIP~t|B4AidURA zc5jb@1iLsa9__A-f=+F9aG|YQwfeL2iGsUwYdZZ!9g2cJR!{M*iM#-1P!)~M9Y>Y6An@4-7)1ch0-3~x?-mO~a)_C8k zDkGr1ij9OWRw)AFLTO_(jIfLK3c9N1Xy{1pOu+L#s(1|e=6<;-L_K=NLq+`#1Sxln z!L(=$%(8kYEKW}N*xyOcM`OipP7ayvgJ!#^{bQkviW>*_uuh9#(KtEDhP-XSzO7of z3J(v-O~2G#6-P^=*alV7))*-Oox*ndcrY67hR1V5I^U(wwpVeZptHMu5*vVG-L+V1 zzn-cr##7AZ#Vc0aWU$x83fR1O)4AxYbe&Q_8j3qz0jY>_@PPG&%F{c+Ab%kaCb;dm z(z+-fCfUWbi6+|L{SV?0cE>}0)WcGgdTM7!hk$akXH zVdDj|m^alxem@4-Ph(kl)i1Y0m$s^AGTdc#>cmhX>%{cOLLRoOj|yv%7u#(8COf*r zS8;GVCQESaDAn2ns5wBDCO~Huo&aIia>d&Qu$>9aIC)ddTHq9jvVzPLR8_A}Va#=e zv=%s3*vu(iI<=*A*ff#OnPya!O@pDvU|ynCn+VIT6YOnWB73V=6&cB?k4g7Ye^)#P z9SPP+82p0>YgOcE<-JZ?C2om1nlT+#SR-`w#X{&vQT3YvsV#O0(RfrErqYw3Q*PY# zK@PpmpBcRilH5)wnMJQ;$d)L(s+xJm*8XHz>Ao=|#rU6yriP;bs|G)+f@X>T!_tt& zhBTSu{xe~%`|-GSW}|K|bG7C*cpvm16(p3Iz zF0D?E3&Q2~nRHlW-QdQ^TEfsOUc7gyEC%l|1eb)q zCLqD7@LM2Il`Mh#9JesLOE=466rN&)lhvxFLWQ~xNMr_zOx1*$ni!bd9MZ=j#o8#G z%gdZ`a$ywzO&n$K6PL@P_MTL6Gh^BW@e>{oQ^KTqs#GV(19mfctap?J2gDVox`Q_^7C9Oim$!!4b0Sv z{M0uwA%AWIEVYTM#|x1>n1vo>q6fVmn%u$zRlnOLZSaebVvlk&SHH+EDXxFAl(A8I zh8dsC>5F?6nrr?vvL#mB_a}3t@0n3IZ(^nqb41m;-Bzoun_z~@$pjyFswNQiokZ64 zowNq6#~+&5B3Q0D%6&3QuGP)fJDl2t$3;piQ~$Dmh)+7HbXF&Ioj#j0cJ3dWA)s!& z>`~ebK~bJSP*Q2qFi%0cO#|ZUYACN)V3}ET#ejrC(Q3ljfYJVTc#?L*Jp|XuxtoOu zDXu$SHKh{pstg!uTa2O0uS&N$=q3l*WPpQh$PupHlz&R0@I~!aAmmU|U`(7Tkf_;i z!4{`oLM~}5vjw#iEqZMex3wXHVI{(#5C-q6B`T)SZJN^0P(5pMVZMS=tEwVf z9kd-fQGOprg`0JL%Y6o_o7+8zn7=SoZ}{0*5` z`R<;+Lkbv;n~HoBrrI*q&jxDJ`_SpvRPQ3_tt#Gx{&t@{-gwSjz&(l}$?ovmVpoy8 zEf`43_q}h4vuwTiEw+wj=<;arPGL%|m(nm0J$eh%kiEuV)tr+4=ylDUN_m?#DSrMm zzAeumr}L@1#Chkt7k10jkk0VycI9q)-7?#H6*JrN3$L(Ps!8(!VLA~b*rTdTps$K6 zfsqzDP40xx;SzrBC?4{&N~Lr7Ru0(1x3d0}=d0e`V^VTtkNEB^qUd+rib%hPciG!uG_AN# zdA%okboY_KAQbo*1-5;DkD6BNG3N07O(

Pgu3$x`FQb_c;gh%Ju(1D$$8j{s(`A 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 diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 0479891..2669ee7 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -2486,11 +2486,18 @@ bool RenX::Server::reconnect(RenX::DisconnectReason reason) void RenX::Server::wipeData() { + RenX::PlayerInfo *player; + Jupiter::ArrayList &xPlugins = *RenX::getCore()->getPlugins(); + while (RenX::Server::players.size() != 0) + { + player = RenX::Server::players.remove(0U); + for (size_t index = 0; index < xPlugins.size(); ++index) + xPlugins.get(index)->RenX_OnPlayerDelete(this, player); + delete player; + } RenX::Server::awaitingPong = false; RenX::Server::rconVersion = 0; RenX::Server::rconUser.truncate(RenX::Server::rconUser.size()); - while (RenX::Server::players.size() != 0) - delete RenX::Server::players.remove(0U); } unsigned int RenX::Server::getVersion() const