From dd2163c1939d5688c0a0bf44aec0cd7727464f4b Mon Sep 17 00:00:00 2001 From: MSWS Date: Tue, 13 Aug 2024 15:36:57 -0700 Subject: [PATCH 1/2] Support next MAUL version --- mod/Jailbreak.Warden/Global/WardenBehavior.cs | 39 +++++++++++++----- public/Jailbreak.Public/API.cs | 4 +- .../Mixin/MAULActainShared.dll | Bin 22016 -> 23552 bytes 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/mod/Jailbreak.Warden/Global/WardenBehavior.cs b/mod/Jailbreak.Warden/Global/WardenBehavior.cs index cd258650..cf703457 100644 --- a/mod/Jailbreak.Warden/Global/WardenBehavior.cs +++ b/mod/Jailbreak.Warden/Global/WardenBehavior.cs @@ -110,10 +110,19 @@ public bool TrySetWarden(CCSPlayerController controller) { API.Stats?.PushStat(new ServerStat("JB_WARDEN_ASSIGNED", Warden.SteamID.ToString())); - oldTag = API.Actain?.getTagService().GetTag(Warden); - oldTagColor = API.Actain?.getTagService().GetTagColor(Warden); - API.Actain?.getTagService().SetTag(Warden, "[WARDEN]"); - API.Actain?.getTagService().SetTagColor(Warden, ChatColors.DarkBlue); + if (API.Actain != null) { + var steam = Warden.SteamID; + Server.NextFrameAsync(async () => { + oldTag = await API.Actain.getTagService().GetTag(steam); + oldTagColor = await API.Actain.getTagService().GetTagColor(steam); + Server.NextFrame(() => { + if (!Warden.IsValid) return; + API.Actain.getTagService().SetTag(Warden, "[WARDEN]", false); + API.Actain.getTagService() + .SetTagColor(Warden, ChatColors.DarkBlue, false); + }); + }); + } foreach (var player in Utilities.GetPlayers()) player.ExecuteClientCommand($"play sounds/{config.WardenNewSoundName}"); @@ -181,9 +190,11 @@ public bool TryRemoveWarden(bool isPass = false) { var ev = new EventNextlevelChanged(true); ev.FireEvent(false); - API.Actain?.getTagService().SetTag(Warden, oldTag!); + if (oldTag != null) + API.Actain?.getTagService().SetTag(Warden, oldTag, false); if (oldTagColor != null) - API.Actain?.getTagService().SetTagColor(Warden, oldTagColor.Value); + API.Actain?.getTagService() + .SetTagColor(Warden, oldTagColor.Value, false); logs.Append(logs.Player(Warden), "is no longer the warden."); } @@ -230,11 +241,17 @@ public HookResult OnDeath(EventPlayerDeath ev, GameEventInfo info) { [GameEventHandler] public HookResult OnChangeTeam(EventPlayerTeam @event, GameEventInfo info) { var player = @event.Userid; - if (player == null) return HookResult.Continue; - - if ("[WARDEN]" == API.Actain?.getTagService().GetTag(player)) { - API.Actain.getTagService().SetTag(player, ""); - API.Actain.getTagService().SetTagColor(player, ChatColors.Default); + if (player == null || !player.IsValid) return HookResult.Continue; + + if (API.Actain != null) { + var steam = player.SteamID; + Server.NextFrameAsync(async () => { + if ("[WARDEN]" != await API.Actain.getTagService().GetTag(steam)) + return; + API.Actain.getTagService().SetTag(player, "", false); + API.Actain.getTagService() + .SetTagColor(player, ChatColors.Default, false); + }); } if (!((IWardenService)this).IsWarden(player)) return HookResult.Continue; diff --git a/public/Jailbreak.Public/API.cs b/public/Jailbreak.Public/API.cs index 01f7a199..cbe66259 100644 --- a/public/Jailbreak.Public/API.cs +++ b/public/Jailbreak.Public/API.cs @@ -1,5 +1,5 @@ -using api.plugin; -using CounterStrikeSharp.API.Core.Capabilities; +using CounterStrikeSharp.API.Core.Capabilities; +using MAULActainShared.plugin; using MStatsShared; namespace Jailbreak.Public; diff --git a/public/Jailbreak.Public/Mixin/MAULActainShared.dll b/public/Jailbreak.Public/Mixin/MAULActainShared.dll index 7373916e3947cca2f7c7b835188bc8f287263e84..781584059dbc1e2536c5387ef31685d7739e37f1 100644 GIT binary patch literal 23552 zcmeHv3wRXQmFB7HhgvPE)vX8M7);B6EgKNxA;2+UHIk6pAdn?NFn&mlx&#faZc*Kh z0pnN-Hi_d9zaRJ&2=R`c#ED}&p2QP7A|yC=636pMCe9`^@Hv^WXJUKTo|$BvY&`!t z_f~fciSh0?yWj5j?G)5s=XLKr_uNO_TUD*jEw_`4h}<|o_<-mexbo2~`0v9A)Pb4L z1?ZX5AJu)sSofp4-tCD@c-T&FvtvWyfmkY)&W5*IVLO)!CsN_o4L#wZblhsFsPNC$ zS$DM&tutKodevJmJEfhX^TTCEBT+9TUL_s0aSh`f!ATSp+EjkCfc=+a33}%<3OBw93d))tbUhr=S=lk`7n{MNa+LLQN%Z7tvy-r$!-92 zQdjLaI61;Z{S9`;9sno4jey{aZo*k~G^4p1Y%7_DA^S>4aB^N-a26fSM5~KfAv-v( zIM_FnJhb9sqTj3`GDP~n4(FNIBdPo1^G(+cLO=jllt2gw5N9P20s>S@350;a;|PR+ z0Np@Y2mwKfBM<@tL|a)10YRxF5CQ_fBM<_DGDo0^`YA+yy12U0MT4k1{12J+Q&~o) zD?JUw4Iv}}eGbzViv9@bIrH5Y)Xc4@KNqyWit4Ac9&N$4GeEDq0ez5}^H@=-=$T9h zKwtb>aifMBY$nkbkeq)H4do8$)Th9x?J$m1)-Bfo@ojEi|p@Wdqjy-7uioQ z<>@w|I9$4fPrxd9-O>@nf^k8(QyeLK1+h465w=E zh(33g1Qmr6zCJF&QBHtHJEIMX>+t8}68s4#a7|25TPWe3aS0xukie`z23gG?T@|JC zc97RT*P!7vI=lY@QmQmMy1&{zcS*>dMi=*2d(bgHGPNYb-KZS>Xf9GX{V3$A$1SAb zKhj_n_~)Pan~IQoo)0X>fS-PWydPD?R(nIeE2Tj}(h|bqH4W1PjIio@d2o^g6As|@d2!wzD{Z@@EAs|@l2!w!OnIjMa zg5{1t2na551VTXYQAePO!W?v|qY(n8xS^=>HK9$_{pUH<4-v-wr>w;9oq1m49Pdnj zW2JZAdfb9$`WrSZzY`YTnKccaEI6-W{c`kTP%9b(-kFOU+F81yp<`~!J9AA#l({We zwxJ6V9FyhA<+#r6vfI%D<+xrU*ADv{xi;H7<+|L)G6VWX`&PNu+Yib$Y=2X()9hc$ zHE6#hSD)=N*`9pp4tyWQ*uZKhUypOxyHLX__UD|2%jVwTojFsvh3SnDRcgk`+OCEO zU#?MFv})e*xgB=36w+bOlxwrSQm)JGE9Kf~?~-f1eUDtj_UGg}&Hk!fgZB62TI?+Q zdOHd!^0lt(X=`LO+tT&LM3Ugm@LrE>MzyX1;UuI{;fwV_vvSnJU4B@K-YiyId&M5kkqlfYN& zh-Q79Xaz>=KVcy-t0!wGQrj|Y(FnT{FJv2g=*i2}x_nmq#%L>aW8mkNK({)X-pa-} zOf1Ph*7y0+QXiQ2jm3og43M}-Q5a`8&KGeW!O3zAQITH)hIz!0u+k%Rbjso6UdM9u zXVDQ=RWOh4O85G2s`AohWsF}G{MXWRs;cQ%Rjj?iKeyaVca-f6c*!UDxS#2hf_)6hD2We5lk*-!0{`otf+P8&urI!fmcp+!Lz=rpxF=4e@zN{7Q1I?`y z?nRyFdf`TWFI96LHVJpS-3&Y!|uEm^|-pn|!nv_rUW5_8kh z|2Qt0>MtYDIvNq(2C=N8PYL%c$#V|cgkv43;&hAX3E`?MnY)z6XcRY}B{kD(hG->y zj|_C*zp9v4a}?b7g{!M%F3KEz(LKX7=!f1g@HbwjuXfJ@`bwC-)XVg2?*+i+Vi^$n z4)4W~T1ZkAea1rIOU4pd)_OR%-@7jbeog2-lCz?Bnq2yg z=0f1pF1EbiTm}5GV6k?uhb@)%$q8Bm{y5s{LceKpZVyYIsw|(IZC(}038_(=_;bkJ z26?|X3Y_oh2L4jwu*Ag?_`Zj6z{7QUThjisNM?%7FNFS@)aYKxZA5HTx!0jYulG9? zHaCrIFKq)J#=2nB$b*7k7d#wd$=j8TFAM%!@NJR5QpWOM*S6*Jd6_mr@-4w{3+@uk z3cgUz+V4~{J{Dwrv|^Ll73P6@(6_9D$LD6vwNwPb#WeSa+CkH#gyt%zcrd@(nu|^8 z#O%0FbHh`D;0|c+^X0E##=KQ?PnPd6-E_C+ZbLc`J*2rWBb|pH)!ZA^ukie%IjY%# z9`mf`Myu0i3B91XTdT9+Uew&C@=iQS`LX7P%7fs3rnz3EE2UGKy9Vh>=}pajr)Hn& zr~j_GpVZt4?tRTIDj77($gCqA2Yu^GJh(5EDQ?;uAwxYyf$pT|?UI{KzPIsl(sN7c zr;E6O%G-*#{grnYad%c8F54JI$p$GA3Rya9S{8gTur`yuNLXn*Zx#3TBUy1`c9eHmdSC_GgfQJ^9E*5dfuq{ zdlQqD949>sYTq*P2tad9zIV-9Iw&QaG@5+xo9E-@Z~8QknV_l_~ch25SUCq1u$!yZ9%-}lXO)#tg@)dpdopmm$gdRKwF#W&x@ zt06v4dL95bkG`zE9t+NJ@k)XZ)IC`5T0lS4x|gBj^%Wl{JugGIkba|ee+OR{DHU{o zXVkkE=ea3}AeQxVob*hoo#iTU6}8J;SmA5kA8S^+u$tFgxOTOR7oB{Z^t6?~YGSD* z$4O5TEyinQK2Cam8fvt4V8xIM0Qd9D*J)>*`jy4L48v;5Pp4SDX$(4DUCJU3YVfNNu(`&rqeu8-xp zduqSv+MMSO*FNLglIQNJ-Q&7C&mFFP-gRxBJ019*tG|eQ)isdkej50%uE9KaF!*cN zb}Ez3b

4pp#Nmt+~enL2%PGH$Cv4D^0UCcTwQC;O1-Y=1?aMQtGGuGrKhmI?p?#Wr7jtQb4ruOQ zaZk_Et(x-~vs_uaTXTQu>%{uvAB$Khqq0wueq@jy>B;Z)%P`+e`0i&KDds_tE>Bn-=uYK61_C zW;*C&&#tF3&9P_KQ;p^>gl<1g*W4x0?WZ}46VGmNTDsyw-0=$B0^IQm+#qz=ipX)Y zVi>vt_fSnI-I&*Xu_jo={R8flBYE9>wH~b38niDQiBVdrIgZ3AU8XsX#3!g-a~z3J zP?zSeHwMiEv{`ev7#=!6G0kx#ZlZ+dI1)FJtvIRe&BV_bIc85Imz(K;=3YQ9H`8Y{ zXBnMzknYypFxH6&>0!-1iyrbxdQ@}YMi2QUeMNKJKR-p!YL5Hor|8?7J6t+w-a;>G z?pUdZZlPB-_a5^6H2q9-?$RK*)0%q@k-wGR)ZB}R{H^q^<{B$I=`-}c<|36raBAW| z==*tjh5Hbd$!*}E?;pymz}09jRWr@~S(>i7y*1~%Z=*Sy`(0qZ`*xbIIalQ(a7#7! zcEu}LQ?Jt82NgTaJE&cA)67@sPTHWkMstUGCv6t)B;AB{$X(Pcx1EF14tLQtit|y` zE6`b*E2-LH-bE?R{Y&LCx|?=u?t{wZ?z`zm&DEB6(mnJ^&7F^!-9xu)t`&LSOZRK8 z3whp4M>Y3)*(-D(J+8TT%66Fd(Nmh6hjjPTbDCR@bobK<&3&Qv6*^2m(A-nCJIurM zSDKrOc7K3=p}9F|_Xp_Lnp=goeURSL+Q_WxMw{? zLCt-?e9(NDrfKfa%RTfk)hSMLd4%Q(cP||(kGLP9f68<1?$6N?xsBgTHw4<i?tK?@357+V&fxSL{9&jmWN6r$10~kIacpw;b(-wIW zaW*-ZVj_oN(4`(?NQo+cr<5D9>>5x1RwN2vHCW524(y;%VlnOH_9e088W}W^R+29n z!JtWhBXv}@Q}Ta58mbmgqrNVQfI*Igh!H>Pkt z-*A?(u$fF!$mb3CV`9h4^?ePr8@1*qM^6Vh|NnSz{J)ul6O;dQKD;h%-7P({yV8Zd zU@7rlD+Kh=IYQR~{dg|*246pRV(0@h-+!TF2=`F`|9=v>V2j7LTO zHDH*I1A`*JfJzOf4~zCS!8hq?V;Mz_%copMZ{kkeLRT0)xO-n|@T?y*uA?h}AH{6_ zCh))-^~NILJYyNK(O3aoVnl$;jWxg( z##&&r(FJTZHX@%k$*05E0{RNjCZaNE1n3rHJMbQ07hN=hMT%cTD8RHL~`EXitdt zw8&3OZm)~{b&(q`X$u$I*9l!G^epT{hCQ=gT$hN*BO;Fp9TR#0HoH9ouvz9E75S*h z4~YDL$d8KrsK}3r{Fum(i~P9APe@rOM1I0mhPs~??P<{(Zt>799tvG2bVTTg&@rK7 zLXQePD)dpIj|zQU=;K147W%Z%qM}H>qeSvAk^F_O6FMSvMCh2%F`-9=9u@kg5*|%%ANPTq1b-#iT*?s}EBzAf z_mKZfbks8j{DJ2b@V|N7WgMlO1jov_^izUV&a}InwPB%~1^Wf#B0nPZnBaFsa!P2b zkhB$?wpr+Y!4bhDf@6ZG1S!DwVZmm>e!(MxV}hpysZuNjn+5v?M+A=ujtNpoECrhd z`vpe?j|h$lemBJJeoE+H2_3HDw9SJ3f+K=Q1jhtV2~xF`BG@e0FE}E2L~u;-lpxiJ zy`cuJ6_h^1h&V87sq;1R(w!Bc`XRqO?u z1^Wd@1dj-g3DPvN6l@mk7d$ep3{e^rJSFJE3h6pyG4)fN{+j+4D+7KHRF3yb6?pL( z#2ck5ylb0^mD6;*9SqaCG#k`HnjtTw+bh<)@uqu9H!wSe>1WC}0iP7wUBmQk)mwnO z%2}Hd`kk6S&|M{*YH4*G_~ig==Lb^2yFyIgEol|~y1|yEh7J6CA8W5Qb_1^#EY?mB zvZd0l6zy8^Fe~_#8csVyye&?3Nb*;yz9V$jV9VB0M&-i`rJS=*BtMYc+A3N5cKOGF zH`E*emQ)@Bx&mD5B_`vPD#lsCJAoHS+Fp^oSH|)cLO)x}bc@uwTWY7u{pa#-H@Aih zrwQcK1KJJbZzxMZdx0j-QqVpi_B2!m+7C2wR)8)Cnm8*#2Y@Ed5a=L(mVmPwbQO@l z`l|(91H`%xZEm0kOa;9bt#9J35hKr-}O(!f)!m7ove z{k4H7QAa?n*5%eQK{$}K3ppO7e>@BVY{du5C z$LK21UjUl)C|v{kzW`186SRpzj{!}39BqO(us{>{bWZ4eamCS8Rq*~Ic!NfLbdt;fM zMMl}Q4Q^c`lf|VqF_2B9Q!#sQ|03FEW&3)vR%|F5U%G@gMpIc_R&=K0xums<+FGc) zrO2jL=twTRJ#8oUS#g!J6&oI!^zlQQT3*`ZA)4$+hbYSMKkTOZQHCkb;L4C)Ry9Aj?<2GB85w5WaGNX zKsJ_0ag-ro=Qbg1gNcC{H*MRV;RMS$dXvc`!^2i8z9wxC#j*$zO6-ZH5?M5;@;ecy z718*roqc_)V*@+!<4LjOuZOu)RygQcKIWa+(ofyI-GP#m- z+h`{zrgEx0QB&Md6Sb{5Tl)4yO}7=xq*D{+t(jmt(i%RNN3}b_#_H$)kzg->PgJGJth&iwO~5wuoBz0XEFBC!G|U> zl9)^)@5v1epxaM$IzMiPtWm?qwGf0~WPg+3|vCOFF$XfeAzDQPOxp z6tj4dvWSbK;fgdxT+|5)mxvsTS@B1@S*9p4`!rtI(w5316wy>B8%rUZ2!2qOV}fH* zG=WJ3iurCUgPswI4<%B)X%$^P*U^xg^AHoMGp$La;w{Mp+FT2|t!?A@Xlo)foX+rV zOUmUTA_WQ&-Ihw*mXPd}9$a~wVxINRl#w?WCtwR_rj#P`%$h_J>ydmhs!GD9*d4w4 z=*Frg0ao1<*WnIJ>(hYAmor$b*ixm{v5bYK6xUK!QRZZEKv6Q6ZnNywcKSLAgc7%; zhlUeL%a(->X7P9=iv`oxT-KtEDGUbO#5rm$_{m>Eqw->TLFTLl3z7*X7F3Z;#v0n1 z+}oST7Uyv}CeAK9jUJ!f%Yi8**swK&byc=V(i^i8>NWV0qIF%`-dQkh+k+W}?_vd! zQyf~r!n8iQl4oaLf$&;1Il&5pHD{wA^GubU?&=#uq4aKRuqQTXW%qVt5t}K< zRp_O_ZYvqvBUF*z@fs0{=LWKcgifeY9{&Qdpm0)f&au?qfF^KO!M;1q1!DH^{7i0TD1aHAt3IJ#an}7IR zhZW0yEM})zAVX}z0zpcjxNe}{v|2!bSYu-bh$r`I!B9r!#lu&+qGVCvdaZ%&G@Q$9 zmlCeuMGwmsjJTRTISeV8Nh!wjspRR*T9R#^VP^_`oRCg; zcS(bG%dhGs-8exM`!s}sN02H(4+T|%!{~Xg7d^Lu2Ydr=ABk8pu}>v*1{!L}`NY)4 znH;S_y*1+-V5^lGuoJ^#cV@2QfLe-4@tU+{afVK(X5VOPU1Df!8k6hLP%IVaDS$Ix z9ZNZ+EaO@1Bml_`s8(~TX0ouO1Y0@gvT`AHhsUB+v7D}WwI`{^3AXVfkfP2#(&nP1 z-BdI(6BRrl$4S>&F*HJEdt!LJN{x!uylb^=l$_$r8r+Kc+GC{>X}dF)!cM}bC=W-6 z;n3u;8{6v$xE6d*6Yqs!3HKW;kMfFQUfs&Dm$&TUbdql}%9##?9Jd~7Y3WhX5Q_hmy#5PNF*}QMfuSPRz>n&`}%EUw9QgiCWE?1p~E+!F`DXl`pO^d94@m zhj=SX-~^I$Z3kil+pRb^e1=+*R?Jq*Pc2~!^aB+PA`B*v= zena85lh>iwJCEWdc4|W?1#6Oh)7wE2J2cCq!;yI0#$G`*1ul`7vsHfDkUgWAo*}~Q z7>^{AXGq(zA5!}eo-S#1ZfIBt-nV3hf<;TtwlM&O#e&<;c3Z=29ZM#;r}LzR`>~Kx zN}h|3pT~KIj-Me?`w29u;e+eQev%Lrq~ca zK&9?Yx979CIfMIua~-PW$0mC5o-B7ai9BCh^3dLK{I_c&8G@JHC(N9Ug_+@rGas zvb>~Xy_Sf+vJKWY(%Z_uvIk#*$8cJTpV5jp2D@=)aB^AWQrDiTl{{y3A-4odjp4c% zZ%;V?9Nzkf_T2H>Zdj%8CPJm$B;F_RUMYdM8SIBDRkU-@rftJ}qG4FtNUiH#StvDw zys0#dXz)J@wW2OjlsO2mB;V5YQZvM_Y$eqrkBjiOh$Xv**b%-t z=6b~Nu7%@IGkS1MiT5^2JwrQ-+ieK{a$=K3lqT4~PgSDxCvJw0J+Y4R-8* z7CQEo%a7yrW;dh*pmVUzBK0ITrM+Ua9lotWI<8?H62zp|(Kw!nbVfnSeS~EN&uHYY zxyTF@s-q`R9q#I3X+Ex27B3!|kHImn*f1pA6il;}iw{fctw8RQ93E^6L^=pe!SXs> zxjIg`GT@!GP6=rV3I{5Qe_>d2w_}GBK&QksJPV`r9OT>~RS?JL-9R*QOCjb37h-Tu zwMnr9PQg63xl)cp+!7YtaYhMOv$#UsP8_V_yf~0aI6NRuXZW|yLxmRRz^KvB)pPnl zae59jm&g5xuTJjlOByAyZNa}YdpTG9Q1M_0OBE*TQcmPUZ-FbY2ZdNC{PQh%Lk!CE8c?RvnV}Q#$UOIKg*6X|tx`JYJXtEL=s@j<;0yo5R}iZnTfgGOd(lUK z=Y8?{`|FmGD@=wvY#2TdAXLj_K*%O0Jwk3|oZ<1-R#`@s&sAcSm4vA_w9D`zb*U#z zRU?msD#ICYhbdTwZyn64kw@_##^%%#U)9Jx_#YZMY}QtdJZw~DtFmUm7j_vwR(Tr@ z!#Iyz_@K2kY(Nl%rQ2_W_CsWPMHDDO$~%w}w*|?gnpnblp~z~2c~uq;m`n_pl(<6s zL;C}zxQ>kAf57+TWqmh>e&YYA?}yh{fAFLEzq|t9b>RDLKLfv{cAv+vhyj1}g4}Bu z_(y2&s~GqPXl~4>hB}5WhHDtEW#|LogOCRfpR)=vZAADB=g1ct zjFC^Dv2G|{!Q!dLSsxhA3+se>*D^1R?Ik}_T)7;7d;$OFgVI zyK-BTi2Z=Fugw0Yr4Eu z*SNehz?GWbGOt(K-t_tvRp#=B_WRH~qV!)jYKg2c+6Va-=hI>=h zH6Uk5Pn*GgrmBk}!7!bnhG98FBg1Tl4u*P$FvC2CX$-9l%?v9f?_6ovZB*r|a&QN5Rd9xJyP0Ux4f_yW3cNsGaC2(~3*CdvY03cr$p0$JuHsOk+=ggxT-X4KXnKx6ok zqv6+sm|ZZqMNvr#?dMR1_ABRky!lzHnwBGskA2a4!%iBXhm1gIKfY-WpvmzQ+yG7= zPSahFrUuLil-Bcz90$61Eo2B`w;QJ_+DQJiF0>wInleaFXNPVsS`fw9zUPWhM} z8^-&Lwmk!uJhYz`$Tr)4;N(*uvP- zB?}i_vTPZK*utjeixxIrvbiH|4E8y!1 z9fQt$zxF&Con5H1{8nQ>ez3701v>}Fsv75oINyTqts))U;0H_Nj_#h;p7Li}7X}}@ zs`a^zd!MfvnH%6d7Hm%sSql64&$fBmDq|2@$Vd)m<~JK_^b1`BbBrd!>%=%>_m|?lo`MnwB!{AYd@HSJkG5C_{{#3 z`+pz;{Ou{>t6~}%?~F`b{1>Js$l0y~=VoZ)_<5sq#9d23Zo)3M57>sk&BVW_+JNT~ zeYmctHK6%;-u=!W)%S(m^Z8KM%M?RyTzR||AFW^v_4cK^k(4J)XZM4*6aSlzVf8nIxAW%bKacu*|H=X93E1u`$}%y>X!Rq zTNs0kjR_`^zlh@>(i4(|*gm{)b2xQ655c04CnIx0smkDGtkg#FDbEqK9|Hy_P{e;Fo`9IE?r zh(7QC&Y~|Fo4>PYU{^919nWS)v$3&gJeE#p^3h={nk}TG$#k@BYkzbsldu{qDgqbj zqI=tkHXAN_=3jTeY}a<0E{v8NO+;Iu@hYu%4Bt_FCh;K(i)<>tS;79xF%5*C4;KyH z$)^0T^sOnYaC|03w3UTPqG=Aq*~b)75V}Wq6Ahf5_Lq2+$mdA+fp=XESw?TUFF9(uYU&q)uJE}sY|`M#BKNr4 z6LNFC-b=2q3(C~Zq>EO+ntN}Yg1SraF zg$NEybdxGm1Xxzs3K5_P*$NS$sI(O#K!H)M$`HX(c$J+X0xTo8LIfzPZG{L>prce- zB0z!ADTN4*!qI;!K?GQ$6O}>)DA1EiAp#WWQl${VQ5O1FC5Qk^bf8j*00lZ)DMWw* zU9A)%KyiVs5CIDGva%2Xim0s+0Sa`yvJe4^3vGo6P+%-53lX5W$X18|#l^Nl1Spo+ z3K3{QlZQTrVUB-QIk*-Gc+1No<^}W0>fu))VrJ1f;6z}_ z+17BRWSwJcXpq%meSWFzbx!NToYo6V)~!zKeSgim-)TKDr{8s`>b&TZ}}{asG;+vhf~D3$&Nr#Y(f)}w!B#@y-qGfwln*xWVCytY*OZ=L3MpKWf| zABJlApf|g~pz#a_QecVFWiW;U6%DKW8H}AkwHtjue_mOR$4L+ar2*!8pj5f*F#{GI z_GgyDX2swCIN)FI^=IlqerVR;$<;KTJ%HAgN>L{D9!E*u%ra!Y1oJi~6O)#h8{#G= zF(Sv=in`QEAp(Xx>Qf34pg(0L5}!Ap#UDY=sC=G};Ogpjc@u zL~uCRWG9FK%T=~Q1ly9Tn@oB;Hx7qccR|wvvo6pSFqb#uyRoIAVAj<%LcRcU(yY6( zDQMQMZhRA@#w#1HGwV87e)GKnw@M*X*+le4wlHDeFqu_4A1A=cAd_?f1 z;Ex1SAX)-HcxlZ1b@ETfs6f%Wo3g!-x*-vO7=&D7tNh2vA&Y zD@1_e8e1U(6q{{@2vGFc3K5{#Vk<;|VymqX0g7H*Ap#WJY=sC=^w|m#Fw_tkKA$%A zU%koDtEnJ@vUhD`Q{$SZHLETM!FnqN9KxBt7@huYd_Rlp?c)A?Hklrk&`)71pY%ev zy`Q32sm9~|C8p(Pv!W$37-N!JjmG&(+<4lBN1edIfj1Y|8kX=9ttoT<%|dYTdS&xBAoiH z|BiAm{UY$O3NH-`lHfwYFAARUbLs;XmsESHHNY76f1=h)w@I1b6+DJo0yLj|{s27{ z^!dFsQS;#-YNQVb19Vp<>;0j3p!Q4X1CbDQ(9;y6tAJkW5)XqS|2nj&_5h7mvTv(I z^T{BWu&3PTk5HkeG7_OL`wJBT`c@g2d5o4sycCmK9ziW$s;KIKhrPZJb4SuH26$o6 zacnS71)qbKnE|#u^jvT|q)JI^tod~nQ5p1X`JGC|BEsGkQmj_k>9At+gq|9}M zG&^5dzh)N*o2SdXNLZ(??-F5KD^w{B!ak!d8-;Du^{o^(rpsIi=*KclZS3`3 zWj~NMTp{dWLb zyvhthZZ}_pe!|76H<^{tJSgZ)y~@LuDs}Iy)W4Tl1?&MB7jO{^q# zOg<|3Uj_FF<^^kmoN81u{#@`yXmBx<_P)c*5%{c^BXgm&@hOoF@&BJammu}e;{UTE zU+Y~7O&#JUCnlZpJW#d~8k=3@Z*{N_hPoW=E1@0-dnVN9V1s4XI@lM>Zg8-PvY3PY zHay~Bo62@O*mITR4%QtmIM|mfZ*efHx*e=H%6=a`cWKoTN805z_n5kQXrJ5nfQji} zj#HkG*BHe+4yQc-z4{T8F9Cd<^31O}Zu%7gd%o<$SlmrVCCzxg>~GCbG3}D@-FrzyB!SMJIz-5o-wh7)2tb6A^kMU^px>>9{NuEzjpxk^S;TS5^R#isT&xI~fwuE< zgb!x_WR}<~)xR?=3%KV&$sSu0^bI0oSZH{3nxF zTzs7JM8j^^Dn-Cvt$5yCZ?lRmkxJL4HuKzEbFPDZ(^uz`3%``oSAMaJud{rd^1Kbv z#RXlCQ=XmW4XzDE_HIP?sv;YYtai0H*alZ?k*zH6bhQ`RWX)z*N0A+=dBE%{vS?_B z3yUT>(4tVxh4qkTwV{*?OC8O=QMuREXS0flU?*KyWQT%b2m372b{5kfMOum7RozK% zE~Y(L9d@wq*Bo(OUrhUPjfbwMO6m8bz8_X}(hW3Ev!7Rl!J?X7U-1^#ja0AMu8OyT ztN>u z>#RKD+C_iT?Al5XuGDTh1&{jJvm^yIW6zRQtJzYd-AoHLyBujZ(-OtRv)$CF)7Z1! zv|cmzY&Tt{8GDwZPR-b}6!mI$z&PR>qw6%g+wjmB#WZ8j(v;MUJxfzoF{wR6x9GIb zp_B~Wq1jhaN`~I5nPqg+IK5M|ajZJV>AjlWfF9dJAF?gcV|(b6n(=ta(ib%2@sg#l zYPQyY#Fe8{nr-xZC`aGb>^_v4r+?7w11K|3r!{*OXH|iIp_vzFK!JXzStis;d+Alp zCPQH`H8CFbtqOj`wT}WaO&;~N1U~^*t=Z1%&${;00?iWDUvW*)MVeh2`iAQkTCUlq z&^N)>X||%`Bpsj)nr*B&<~l$fn*Gi=Nw?A#&HUyu*R6D&uv7GWc_$sD=n_83`Ko4s z)hp&(Uv(0!NwW=A$6N>La?RFNuA?u?$hk;H7DsXJ*3(DYL2-M z(+4!$fqp+iAJHsVqD-i+-h;l=2q(y|9Pq#q#G|Z=w6;GRN#EuDj`cxy(I8k5>G|bq_rv z?5OWvIocuO=OtZGyPOQwop;>=z80;y{UPW~8 zqyM2$^={amxRBj4NUUo?9$a+2<+S2TMqa?Eu<8FD#3>U(SCXRc%9 z*X+T_ufQUjeG((<9W-CFC(6TMi#59m`QAwlnvEjgJ87+*ulgm|19YWk)7Ae5)~?wr z-XpFDsYkO&nFssj9g0b;AHpa$=+ZFbAF+5c=`FZ%?xH#$@06E7w)Lzrs0TI%EiYqy z8T&-r{zOGM?4}J^V!g4RYcWwmIP9Y547TJNooLcm9iFhP4ugiJWQ8i%#~mfimX+q? zMmTKJlhO+1ztaEZ_9{PLLW^9|Min2EUaH{8yzJwaz8nmPJv3i-%FfdM6}KD=?8msJ zPdYp-wbY~`u~E@h?Y%V2e!heqy+PYhvMsZv9RXE~@~zIH|5h#ApTNxu+j1_AGnIW~ z4_)*qqKdXa_DJin>k!}mUqw3t|8f3bh%sQ$F&VcC|L^KDv7h%7Uqz~b9y(9tMZf^= z?JTVd)8&FKg584K1a}I?1or@IX#!~Adcft}4P1abKTE5kf(z)3q%JbJ%#VtEl0Ijw zqGiU4+RJf2<1lTYRYpJ7Dwi94jcYOX(KW#DV-9|0YXUsQD@*7-Q(5M53jf1V<44QL| zM&S9z8Y6@VwE#B&7vTyM^<0d&t-(HQH+8v}VinZoX~bQ}E_WkUQx9+f?Eo&O0N#w3yN-+IglJBP=5f({T{K@8%^A@cxaxJe z7YQ!LdM)Z%?BWtyMAIsoR?);n6BkWfGzqM6Hh2z+{xI}QJcmVp*v0*IT=b6%o)LUO z^1dK8hFj_tY!U2sAExD=m_|-LB>Llmj|-j=G(3`5uthK?cu4SwhkJ9%Bas))S#~@>?;FRFB;AufRN9+Zg1&0JD1*Zh31y2joJh2ySp2u-$7I{eIA(1Bqrv!btHuoAU zaCaw!YkoDZIyKPL;(C1!=JI3b#Vcy%PiHtoR+fxD`g0y{!Yz)cnGVTH-Kxr%YPavkt- z$$O7zt}bVNR^;O~EZ-rmd!?*Y@8%%a_^`y}&owMxTg$2CLAHOV$RyEtII;nn|5nba z`$hgibt~j^$^vc^PmEpYjg45f8hAeDf!vIzHU_l-O}rZBhujJ@sSQ1aCmlc&PjxCF zcLGg3NvVX~4K(R$ti23eg{vUp?L5fafhO%h zzZ-Nd(8S%tg^+gwO^lg3$kzi+JR@2J`6i%=yK{>n4*^ZwRl6ASFwn%EvZas{K$9$5 z26+T%;yzUa=1QO{`D1L4F6Tg_ z@&iBH9mNiMLL3(4PdF^kqcdpsxT;dK6JN=rQ0DwCE$`p5%Rm^EeHP zwQ2GA8vRlzTRm6QzF(x7b{(?!bLzfD-@-nH&`SsKxeK4S;q!TX9#bW4DWp=d;gmJB zin`m=g)u8@v))u;G?{MAq(_pYNF9jfb~}vnnJn1mWG;`dwq!h?%%o%4iJ{drYUKy} z^HyxEJF$K(ZSPL!@pWZSCQ(RP8>zjO`fz);XwxQgOCi52lTF@YB~;Ef45ju?YRweV zc`M8B4(zu2cg3>fjV-<1NZCql{nXP>Ed#VSmMU0-gVbXsk}>L^$mOlE#@0+KWrKmQSz4_{)^=skSS#U3oT*`(&6Xp%NTjaV zm|bS45?R|5E2LV+le)4JE2Lv*MFftkn2P7yb5>So(qchrx^tbe(NQZwH)oP*eD$H#pOJc8;%_nnK zzZK7<6TOIBW{v<{jcE5+xm;}2nq9^g^!IG7_IU2Zw&dPq4!tvX>Oj)U&YjYqkLBm6 zt94f_KM)(8?L^xqoZo46rl>b`X4|l%ZPsvMj_iH0^zPXidb7zfOa*f%a%tPMsoA;g zCeKcBcGT?DwnA10^6Zp8E0)WoXY1Q?-RY6cY`yloGn*-l&rao_&(`W*oI8>G2s2S; zj(qLe>|E-$+#FS8@`;wj90}a3b0(mx=P>8~m_yy(+7-)nS;^5|d7S7N;A3+bNlfO@ z_ZQ-E4Exzm7tfn9E1jPsy?;EDPjQ{IvvNrLtt`&F-c0rl(lKXVV@=GRw>K4=u(BMS z9XN-Elc{8Wwk1!4MIW8#woHU`r;N+VPu;DV%QZT zOQr`hDtdY@qcJt7*=?qdWIEBBN}^9yo2kzlox!`?lDY9rj@J-UFP{QZp$P1WK4Xdr zPR{A}JWw>4p=eB?FjyrGa%s zR@$*Cmb0+R;ijo}$wVs-D5*6wHl9pbSy^mg4ov1l1CWl32tU7!$2&HFm>SfO4hzic6TYE zeLqfdzO0l~cHxMgg?V=FM4m4B`p-+e)GRBUJ%ua=9#0*~+}tIoRivJ&OSSh|BmJ=v zD?ibPwPCKLSJ9LT`>a%KzetXB+iSExQHbYD8SUtyKK?OMDZ$RcCCAber35`7M4#8Q zMJZJlm(;!=P0T0vTEufG)xwP4&%Th;Kt^5BA#`MM$|h11S}~SWW$~#eV^E4H zu>mW-i^dDNT~Z^rSqwyA9~>8WNpSKkTia(BPRLkl)*7@ikxEI)SO-Xc{^oMo16yay z1K3FD7!mJJ#Bd<9+e%ATC3UM1JAzBG@nqw;>|ltS(_g@eB2yg2c%qYH?3qPMDiW@_ zG?oeZ^stsZ=%3=+S@O+LbYq)?HuIUHYS2So)nF4n7Y$&9Hu7oQhdT(MtP#DlA&j&(D;Liu$HngKQpEwa29oNvn3Yu#2A7&4yVIMKW5XFtfMa8^ zbb?QHE_hQcZHuygX0@FGBKMYBMyZy`ii(nKWt+>Afz+iHt3gFMpL3Zdxo0RwdG$rz z_Qfm9RY||8Xyj%m@QF7=yV;7N6LPzf<1>@g=-!`TXM1z&f>dl6W};|A-JVuF*a69QXdD?6S^@%2GD(}j@ZszI%- z{VKXVab_ZMLPE@_PN{trfYm)KZT8*N$B;$NSlW|#NQFng~aly7->YG6Z`I;oF7Ku`cbz1on z!7N!KNWo;P@~G)k$Wr3QJ;ft$=GN*lS8dJ@vcWL;U$ADa~U!|6FJe_ z@*Au~)cunjRwQzs7OT?NFV@QfL@yC@G=|~W$g?0u1}{`|jw!LEQ%ewBTsR8FLQ6B# z7E%8dpJd^gM0RddJQm+&CAe1=N0+Jwih!{0z)Y7AqF257JnC1*e2G!kO0ws)U6{2J zuxjMHP>!~Z!M&8`S}slejatKA&9Tc-qhs1>({Dnj-~QOcarD6!TqQ*4ay6;fX&qe|hu zqZA+l%9i<=&knV(lr)~A9V$$Aeb%0WmCI94X0Npc*Jt~T<}*U->&De$KPFMeTw!D+ zxnIyOn2jx86RxlQ^2^-PZX`yOv>>nZBvVR=SAg@O*&FFW?~Ds8q^^A^;k;=-|`${uM)3{Mj{{al^);;UUE`Yq|QUcVD@XgJ!!<7TK^V&6JBq$uH z6#k;H=3&PUCxLd28F&^&?FHz0K&l|lEW43t^6pa1OD@FVoaz&&19ruHZgZn-hqxy! zxMQCs+)QVKxSu#!&aya=DL5P#r*r&E+_6#*b70ij&&{*PfHOabnd{?m#NT%5>`MkU zv2Dq}vqw2M{9fnD5S1p(HKgq5b2xI+n;do4TBxX?8>Irkm9p!5rE%<<>R)HnRZTpx zagV5Jh28n+R^6?3bnS}SFelyUj5*dIs3aq8=XB|nng=>aR}6v!dTY_ z8#R!5?iq$PpAf@RJC{6HE~@B4>&M^={}H{rDf9LBj2&sdEB2f3Kf30rpOGs{hC7Ov z?>vC2S{6ehu4B=|;zEzNHqv86ZgrIz(c(iO59N!P>~=AtRECq{^Z$!{>`kc$*BvxPV*%!&eqHA`{`NgYJM)m50Ja zeUXU}>MI}%t^ks`n#yz`sH2)-97&-@lZ9QrPhT~7d)4;?SNOhtp!)UitoYG3ynuig zW&;d(ro50e2L8R1yMuv$8RX`l0J(2qz(h%I{NR+_=P~dvmr)g95koJ-jSM$2 z3<3;tzvtoeHX>L}h->LH`JqN*@}9F+1J3m*?kBwAExF}Uol$QbmPfI%Hgc*qT_aF<^%K zcPGbXi>RL~8m2d7;%ANCa<5l9)AR;RuW5RHikG{*RrxaA2`+DB7x;d+H!^vz%eycX zFz}>YLclSK;GHgtY-2c=AIOz`glAC` zl8nMgj7MRx3~3=8KCyuijJj$gmSG}8kjIQGawBqqy8KatQzC7g9}46*%ejzpPt**S z2O$PARE=P{55p1FL~ab=^+*W5$c?6tM_ke@51}-qpbQhWq9hPiK`0P4Ya?T8J*pNecadJt*ei7L}5{j zpIpy+hK~1xsSG!!aVO2fe@_LnN}W5HbPZ}0(y%U`SU0lvvc%tI()|6o^pcW2i?`hymG-FdDQNl<{1>3XS&Gj+ zNV~_8#umjNi!i~_*WcFPcI)u*saSRA-9yWEE}vTUESIrzm~RE z(KwzMrv9#$)$7)iu6& z7}0I1R1d18v0NO(+mbu$I?wADqnNWpF|)k?6pa7R1j757G&!@ma=PKFI$O_nUHDu# ziT@b{?{C^i!nGFS4(yl)f$ew`upc|dt=Rhx;(H6;D#ZV-g5xpwZ~v^`>Ecnwhx)dE z?d*m|%}tUh&?Z(pu=c_&X{@?e5s{1+x_p9)r2?TjAA6z4&T1lz-6qOu_EHS`3+5u7_XqS z_~un?sRe(n&PKF>Hxhi{;)Jp`qnuGGg`+Z#cyLQb(dImCqWJVlom;h@BhGc&?Ptat zjlbSrXWgnF_+Cf`9;uansTF^{EL4YgGWm_rnPr?E!BYGh@K$IXb*;m`U@iVxN*GLblSJ>DnflvViS{d*j_Mvym#6yAldMGihLlm2VL2;lt_Z=X|g cH{*@{;1%w_(=nv}&qyC`(ER`7KVJm?7j3ycu>b%7 From a7ad1357e3732605e124969828c2c5bf596b46f1 Mon Sep 17 00:00:00 2001 From: MSWS Date: Wed, 14 Aug 2024 18:18:11 -0700 Subject: [PATCH 2/2] Pass synchronously --- mod/Jailbreak.Warden/Global/WardenBehavior.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mod/Jailbreak.Warden/Global/WardenBehavior.cs b/mod/Jailbreak.Warden/Global/WardenBehavior.cs index cf703457..2c9053cf 100644 --- a/mod/Jailbreak.Warden/Global/WardenBehavior.cs +++ b/mod/Jailbreak.Warden/Global/WardenBehavior.cs @@ -248,9 +248,12 @@ public HookResult OnChangeTeam(EventPlayerTeam @event, GameEventInfo info) { Server.NextFrameAsync(async () => { if ("[WARDEN]" != await API.Actain.getTagService().GetTag(steam)) return; - API.Actain.getTagService().SetTag(player, "", false); - API.Actain.getTagService() - .SetTagColor(player, ChatColors.Default, false); + Server.NextFrame(() => { + if (!player.IsValid) return; + API.Actain.getTagService().SetTag(player, "", false); + API.Actain.getTagService() + .SetTagColor(player, ChatColors.Default, false); + }); }); }