From eb98dd91391263a3d102ef227df9209ebae2f45e Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Sat, 29 Aug 2015 18:52:46 -0400 Subject: [PATCH] Reverted previous two commits; updated Jupiter (better fix). --- Jupiter | 2 +- Release/Bot.lib | Bin 25566 -> 25566 bytes Release/Plugins/RenX.Core.lib | Bin 134426 -> 134426 bytes RenX.Core/RenX_Server.cpp | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jupiter b/Jupiter index b8bd29d..4d20ab6 160000 --- a/Jupiter +++ b/Jupiter @@ -1 +1 @@ -Subproject commit b8bd29d055b995835c3deb4530a23a559ae91ac0 +Subproject commit 4d20ab64300ba49a923c712106dd2a040fa95bcc diff --git a/Release/Bot.lib b/Release/Bot.lib index 25e99795ab77cc792dc14fae370f6e09c441b5b3..1e5cf6bd74f66368d4d04113d0c6de20bc641bc8 100644 GIT binary patch delta 2131 zcmZuyTS(J!6yEYeH+8jJHnr)rw2SNFa^`M2r|xRYt<9x#Ix3<-gnBApD=1=cUWy*n zmm&&8f*!j;_?RydNt8q{5mC`o1l9Tf&i;CS;@Pi&c-dQ5yF&E)u zE{lZUb{iBv%((+Rjm|^x9*>v9D*KLSUG_Gw#J=D)Y{A?~n?|E4)s({X${KjcN-C9$YVBze^6c$dLTPBcSQ8|MX!z%cCe+54he&co=Bx_gUk(&9#Jr!GTn`SPS{MEyvrT8%BXn|M5^*rN-5h_$Ya(NXt!~6(Y7{ySJSUyVtE!+sx3F9iy1hFiYa3Rl2 zyap&_TRCT`_?G<4N-MW=rlazij*?ktFk?5GHPt){nH-z086Za|`yjX0FyV}{KRqy) zvw^Rr6dL8@RI9!ild3k4(-^$t((8<`rPzUI<6XQX+*ENEN~M0(_^71`a(SlF1h?}P IIhVKp2Q>n~MgRZ+ delta 2131 zcmZuyT}YE*6yDNAD{HmCY--bKX+O?FTj~CEPM!O)<<{oXIUN51{!l9r`_@>X4eg4pQq8e3Eu1Wa9CyEaj(nX?vdDI9>ZqL9k*#TnnFz>yx3X}A6ykY z;bNXriIk0kVt|luGgNvFoEGs?CM(j4kQULE!BsCG4m|Uc;`iQu9vO-gJlq!N@Z|x5 zzqR#oIN46{c>5I&H*^xb+ZX2Wbsxc#J|Bnw_(*IOiY-O4GgdP+byzt?9q+XcX<#b6 zBEvW&;nAqSl_z=SCwR_(jKiu}f2SlCRf#0Col;3_7r~CM08fJOHpROA*n<(x^LUyd zx=|0$t4iT>mt>*36ZURtCvx31g&NFY#wqA@6&P6zx7IkDruvqEWLqv^C{gOSV00N& z1rC6-s05M$$?{!26nm(ri)+Va5uHBjajgeif)acoNbDOyX^M+M!xlxrK@?Dls|oiu z)k1AZ>Kr+u(8W-Y7n%;)y%HtUOKBRAQmdrVHtvD@G6%gDttwvcA&wE;wyltrjZPgW zr4z?{c?0u#cv*(i(fn|tQO^F7hgYJBRoD!kq+YbrgBtc@D{pN+m^#H;*(YXK(Z^~|FA;b8Z z3LlzLs#Eb{xVau?2da3+4TDsuZ1B=5Y=)UZvM`LHZn1n8KU!D}lQH8e&jgV)m2e`@ zL%eFpr5iZsWBx7qm6lfS|CtWSXF5b?oxzOlXx5dwAxLG|bj<)6I@yPrwT202l>O;| z>5L7$^@UI)AE#RN<*-z>ZiL3*8IfLRd@aQeJRfP}9pR>mvrsB^qsGVewUEg&jV8FA JrO4^5{U6j8#|Z!c diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 8f319006b7c9b31b96224ce6051a39c50be486a2..a9231935719ff4cb8f21cb0096b245070474e6c4 100644 GIT binary patch delta 8066 zcmZu$dtB627U#|f4Uq&j9ee^xg+z)y%ve(_b6po@ct$2TkQplKpw^m^jb=vJDmKPN zDx%UdGkl=Qnk1ATGb=&*lv}n$X1*hI%|$cZbI!fzH^1M=e{km9^Z1_Uy}z=ufU>fH z;(`7n@4joKCwxQbwzy;K>7T0b4gELJUow88xTVYS5y#Skg`Z!5d^17x+f_7C92b15 zw=7H$A-3Zqc9kWFAQQQEk_hR9Cy&V26GWJVQ~hM{WbrGVEJ+m6a7e}^3Ww6<)|AbO zVxp!T6VasmPCq|Co80CQ13a(y>M9e{#LX?w546t4PIaPtv_aQM}IdM>7Sp1M!sQiqt0=}>e(K855 zd=P~9@bmZcEWL7*r}@fY8UBRmCKHo|T^-kI4rcgZjy&HL@&?iKe~7wP{v?L zFrc*$i*ZUfrUv;G4F`LJPmZnw=lrTWPhkt+Oo2&fuX5$bX8=qj5YWv47YM-xkgY|7!E(O68Rt<%{C zg0%iah24n9xM5)Rz5SS?RzD^tD9C`Bj>pbm=-Gwp8QKL52Jwt~+?QwH(muy|mOtW?MGj(WU0F1lA(?dJLKqrl5sRtI-gMF{R`P5!W_wjZWc%!4-#GXC3z(pz+zYiJ;`t(3RWWJ;SOEi)c#B0b$8<>@#ATtbK|nG6Fy-Wy7y2n2?79MT##>loy#lDPwb=6)wXE zZ$SjOIo&LEvcpPV^1L$Jxm38VW``_evyGUee}|TFDzJYA&oLusdff63RiChuQ8h(% z8n~JXs19`|`#K6K9V$a0hJ?vHV9Y{Hio1zyA67~f_ZsDm?FEJeAXj+KfU{0KJ0@6U z;8~siq@ny>buOb&tkrQZRKe^2qR7(}bDdPbXsQ#toK~dwhNnTxbkq{jT||4FX~R4Z z@4HE!E#mn?8L+BCX^UUULbz96UCF(YDet_*6jvwJG#vlr#$v?9sKuFp;>WS3TEv11 zl^o=)t8|bFEbeH|)m);4Mayc9c0Tx$2flb>XFTcyHj1^&EycRAxPfyHsBYiCK*q1p z$Ql75>m0x`7g$`MQFqnglXckkh$j>6;P@73z%h5F~!5nX0t8=_WuZiWa=rs`ul!_@}!V?Hi{OkvP#)Tvp8%tD> zPn3vKU0Aw3S4wWrTrUetxnAgK&^mQAe4Qv(M>!js*XeAq1hA+~2N0;_R?MsB5s5R3 z@O>0)egvjrSeH3N1^CFGFD!6MQRN8toHfbo>qOI)*jWRneN|^6VQT3%hD}?*?tmmaI1| z1%z3J0z=;N?SQp!u?h$a0lVaF4jm!GN5`!uz_DKyf!7t;Ilh2zZPJO93Op;p zVVOTrjK@q;*-Y@w`a+qO@s3!e0-~Eh$-C?VB@DN(?eB8?B67|~9r!0f$7--6ym6*C zKr-Y#<E=zG0N}lMhGx9aGt`p3QJXn?S<$J@9V*)N0V`sd zGb&9mdle1bq7@mrg>h@y!tIN;->-gGNnE^DOi^CB;hK$%eYf$(%8PUPHeQ@5hj@fX zZs!qhTpRFw({_=iBm$Wv=2Z!&qVS%4wTky-)IsHeH;Fg>I{A4H2i_`o?l2~Sd9@4N zX9M<6x_h?*b@OgMN%6${g5kplvhE`>*i*d1Ulz1<=)>-hv=0(5 zPiTL_9x>Snn_c215XlGkn4)Qy-1{sfw#F|g^UNQ-U@5V0UxJ`_a{XXTGSqyW1%7w@YK5!o=I2TdnK8=QD5`IkW|G5Wc z#n;y-=bZoPHDMeWu@?Yx+3%4xKLMlnb;Fzzv-b0&3gXkaUpKJ~I9&&)^X1=BjUM{E z6|MS=J0iKnojLvhcV@<{^?(VpP&xf`)nXTYt}k#r@?#E~gKXS{8V;I+#|?VP7u=wY zeoQf405*Rv&wnY>qPboR^j2y!F)RNCF|y^D^kn9;=V?Ob=x781@VVCB$mrz z!y)b<9J{&o%m}*d@^rmA-(D}OO&M~yK?mn=U}^(q@6)4vqR5E24>Ka9Ik-^?jBFIS zN?>uLO2R#jVwOn--(Sse_R_YC%<6HAB-;X1MUy{YIf!u-PdV;@cO&{Ti%}Zqu%%<+>*%8502;>N&qEC zG10S@kM?GuMON0oIc9Ja3$o-pUNAZTUi(hxAHUQ^e$Ov;Mgyg}F$&Z*Q(g5NDu?Yb zmy2~1ian~=6b@9&Q4SP$te1b#6zc5!qCDb1`~<^!M_}Sp$S*Rx2^y{Ir0>h8dYlV~nh!h)w`4ry-(aPyNNG8OY*hokz`>`DSXJzbho|Uk3 zlfpDmcpenW`{Kl3ebzk-?76?NL>h4X0(#~bZcOx`mU%)K<}D!iA^`R5nLcuNpiQrb z<|n;VC-_Ov(kYxLxdB-8w4U@yz(uDx0f~=e+jfex19frEEI#d}(!{xXnol#d1!s6f zm=2blwK$F694HO&n?pNz*L*fczJErKC4R*ZI>(iW9|o`~7M^2mlui5u67VbE_bmf$ z_~T1@3x6FUU(pN{+t9+xB8laWHRU(mv8c%TaiQ%uR%Ve=+G>%3rjdu3tpNgF zAm`ujlNGdqQ|`F5l zN1|#@hC@Me>_rhN9is)6vn~ZgI3f^tk@p@;5*)h7VY6hv<9FV&h#Plq@*@tEg@7NP zx;`UXiJ$C9iDh5t3H}ajy~o_radGbMP=V{+#>2uLubKKd)#AQuj0gFFyCz6{#c9*8)MoHrX}9TTG`>uh37dMa$6-eD z#@lRqcjfo-t2P_IkDI^#+zKwWT#S(6)f_(Rm;?N66sJ4;FQB5pXP2Q^ z6v2zrWJ(hEIGnk-gAfl^=`d^n*%O3$f8k3}TY$}bu_LsWcd=!tC5vyfL4me(qL71@ zFDiF}g#+@#yz@hialR{e>uS??WupKwH%hzOrYnI#>gh2i$QDNg_?m8)5&DZ#Ns#R> RriRKBK{k3$xe{ax|35!;$l3q^ delta 8066 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 Rm>Mci2HEI2E{QuDsLOuWh diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 49c4ab9..1bf4809 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -189,7 +189,7 @@ bool RenX::Server::isPure() const int RenX::Server::send(const Jupiter::ReadableString &command) { - return RenX::Server::sock.send("c"_jrs + command + "\n"_jrs); + return RenX::Server::sock.send("c"_jrs + command + '\n'); } int RenX::Server::sendMessage(const Jupiter::ReadableString &message) @@ -204,12 +204,12 @@ int RenX::Server::sendMessage(const Jupiter::ReadableString &message) return r; } else - return RenX::Server::sock.send("chostsay "_jrs + message + "\n"_jrs); + return RenX::Server::sock.send("chostsay "_jrs + message + '\n'); } int RenX::Server::sendMessage(const RenX::PlayerInfo *player, const Jupiter::ReadableString &message) { - auto cmd = "chostprivatesay pid"_jrs + Jupiter::StringS::Format("%d ", player->id) + message + "\n"_jrs; + auto cmd = "chostprivatesay pid"_jrs + Jupiter::StringS::Format("%d ", player->id) + message + '\n'; RenX::sanitizeString(cmd); return RenX::Server::sock.send(cmd); }