From b8dc5accd0ea0b895b3778ddb8588754cccc5817 Mon Sep 17 00:00:00 2001 From: linmeideli <2558527373@qq.com> Date: Sat, 15 Aug 2026 02:45:51 +0800 Subject: [PATCH 1/3] a weird issue --- src/Empostor.Server/Net/State/ClientPlayer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Empostor.Server/Net/State/ClientPlayer.cs b/src/Empostor.Server/Net/State/ClientPlayer.cs index 72fde4c..34d7ffe 100644 --- a/src/Empostor.Server/Net/State/ClientPlayer.cs +++ b/src/Empostor.Server/Net/State/ClientPlayer.cs @@ -73,7 +73,7 @@ namespace Empostor.Server.Net.State { try { - if (Character == null) + if (Character == null && Game.GameState != GameStates.NotStarted) { _logger.LogInformation("{Code} - Player {Id} spawn timed out, kicking.", Game.Code, Client.Id); await KickAsync(); From 3e0829e05fbad793dcccc45cad8f4bac5c8edfa6 Mon Sep 17 00:00:00 2001 From: linmeideli <2558527373@qq.com> Date: Sat, 15 Aug 2026 12:25:03 +0800 Subject: [PATCH 2/3] reroll --- src/Empostor.Api.Innersloth.Generator/packages.lock.json | 3 +-- src/Empostor.Api/packages.lock.json | 3 +-- src/Empostor.Server/Net/State/ClientPlayer.cs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Empostor.Api.Innersloth.Generator/packages.lock.json b/src/Empostor.Api.Innersloth.Generator/packages.lock.json index 5850ca3..fb68fad 100644 --- a/src/Empostor.Api.Innersloth.Generator/packages.lock.json +++ b/src/Empostor.Api.Innersloth.Generator/packages.lock.json @@ -150,7 +150,6 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } } - }, - ".NETStandard,Version=v2.0/win-x64": {} + } } } \ No newline at end of file diff --git a/src/Empostor.Api/packages.lock.json b/src/Empostor.Api/packages.lock.json index e851b84..9d991b4 100644 --- a/src/Empostor.Api/packages.lock.json +++ b/src/Empostor.Api/packages.lock.json @@ -139,7 +139,6 @@ "NextFast.Hazel.Abstractions": { "type": "Project" } - }, - "net8.0/win-x64": {} + } } } \ No newline at end of file diff --git a/src/Empostor.Server/Net/State/ClientPlayer.cs b/src/Empostor.Server/Net/State/ClientPlayer.cs index 34d7ffe..72fde4c 100644 --- a/src/Empostor.Server/Net/State/ClientPlayer.cs +++ b/src/Empostor.Server/Net/State/ClientPlayer.cs @@ -73,7 +73,7 @@ namespace Empostor.Server.Net.State { try { - if (Character == null && Game.GameState != GameStates.NotStarted) + if (Character == null) { _logger.LogInformation("{Code} - Player {Id} spawn timed out, kicking.", Game.Code, Client.Id); await KickAsync(); From 62509fa0e099792c23458cde1827bb973bd884d3 Mon Sep 17 00:00:00 2001 From: linmeideli <2558527373@qq.com> Date: Sat, 15 Aug 2026 12:29:35 +0800 Subject: [PATCH 3/3] fix --- .../Empostor.Plugins.PlayerChannel.dll | Bin 13312 -> 13312 bytes marketplace/Empostor.Plugins.Welcome.dll | Bin 17920 -> 25088 bytes src/Empostor.Server/Net/State/Game.Data.cs | 16 +++++----------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/marketplace/Empostor.Plugins.PlayerChannel.dll b/marketplace/Empostor.Plugins.PlayerChannel.dll index c5f3de2a5337d0cb040c7006ef6495f14a6a3e14..deabdd2b9b73c035c11c8751cf98c7cb01839929 100644 GIT binary patch delta 3421 zcmZu!3vgA%8UA+9x#ylo67sk_!ZYEOkldSG^MLRO1M)JpN+?iD0r8RtP*j9q#D;K# zQ3^tVc*_~|np>%@W0%DmCL8g|$7gonXN=quG(=t`*)PfeF-)=6cwQlBo`+xuc z@4x@QXV2bE%d(bbJ2sg|KL7A~+tz`ipl#p0wD<1#Tpg9<-a zhW+^>PelC<#5w*xF)!PzqM3~&ArZjVd|=WLK=_@7V-nT!BV#}aFh@lCj$EHb;ifeZ zuo}h#?ueFu%x#$^ZfBiVSXWVmst-Un9lX+L1QpwAvUJShQ9)@jB zr=&EhUwN<6WKfb#3PU$VmXqOx0~J41!XdQ(BMH$|+Q21u_HqQd*$?*jxLN(j8^E1>MpHA0>unVj zHE`XnmMs5GcU6SdT(wUle)RH5$+Fg=`d`@+$z?O z3FM|f%`5KBy#Q_iaHY7yz_<8J@Hcyr_|q2O9h-&Uo7Zd$GXe@%8prKkn8f)kWScJs zEEEO49klR*sc?zLxW*eA4;o5;N=N9eBeWVSj`S{BE*$xmorV)A7iriX` z(6vxvsyHP&+D>97UNh2yF1}%&U}R}16!rz-=pyjJVwoVE&mP8l&@kV z@g}wqi?KtF#!&Gi*@q*ZmDM?_)Q$Z*?EP_?L%E7xb`Hn`LSjIYZ3-$jG|ARzTezEv z<>H`}SgTnZip49^K!;`w5U6u|W*6cT^7FVT<_9R=V*>TM-ivsswv;~Iia>dO+ zI@~zYlC;LN3=g3s`?H;Dq@YGKwNMsP@#z1s7R|auqo-^S@cak5#6_7y_K;?6{SMn9 zBMslztUF2?S~Y9szUfC>oTm-81QhP#$)j$}`ncxJvu<y zR%zTv?2ng-7EWtC3$+Sop{iFtBatDLHJ2F1D5Bc;9d;=m)BYPos&Nm0VLR;j0)()~ zevqf*EU%e+TFGH8w~1o8jZWt+pPEK*H-0RJ85TX2T!unpKXH+lAXZu@(21u5ZxYwb zcdFa2A!&@Fcd0tJDzVgwx(NjMe!bqbx+HxMih?3EFjP5>*lt zbSh`XRxwqa6Z?YI8W)Oh(x*|&>qI9Wa}E$o?Sn#y>E031CF;1(+eD|gjmaIhjtfUL zij$%X>+CZkehvqOs%EEnTbx4ymoWu(fj@CTp1i_9d*xN}SMk1kP0Zoicygg$8zC0i z$Hiydd}?e{aG)$hnRk^pg*)X?IRY!tF7vPeZ<|H%P;M0QD4IwdfJMY%s3#Vp-6)Eq z6u%`IkKYle;3APf55(ET$!JBbIT=64a&ro5u$ibrPbF?Pr)fE+ePY_DM*GxgeVxV) z+PXnoTeY=S>z~xP8Swcz4(uRJc~lN1fr6yY*#G#6OxfH!fvJnl0V84;~fC z*1(ULUvp0@l)vUj{8g_gy}s&q%KfUYOg^iB!@eA^QjY8PQ&*eYty0!%B@d0BRw=jr zU%*0H?RSRq?DOIU)C(Z-QAmhhYhtUH)~%VcX7vLT%NH*mlL+=XWG7Az&X9@sau%EE zFTT6$Q1y3TuiCNVp97zK7ihXEv3wOFk@BbKz9D$N3Kn*$or+JN)ZT_ z6h+k^Fh-z6lSpk{V_|7sw4!8eU9`M@Nvw9v*wWe>wzBe?SZzgp*^*dIc}+!KZGDWT z-7PTP&nO(?Zyt4qH@r=a*{u-wRI8=j!6)Y~J_S9s@{j~S2q2HoLD~)$_!|p`rq5qr zefd=U4^@XNH@~v_)9kJO%LT0^N#*=clS;-mCY&GskE5&R1T+49$C6tdf4gN@QOaq{ z?ZfNm6NOLt4@aNy)4~%|uX8utZrA~CnD~zWS$LQz^9M!#XhdQA zw<3d5OHhR9?I#f_su9LhDE0l~+!g;dMNo@6H1dlsWgkTaN_eO%sT}oKf*9>%s3~Qy zK2h~oMq7=xRM4kPd(~)N1xMCW7t_~aUX_{3kmv}fXTHSD=poS-wVX-a|0RXTCNfGs HrY86wEp>kO delta 3559 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 IMgsc(1CyvY{{R30 diff --git a/src/Empostor.Server/Net/State/Game.Data.cs b/src/Empostor.Server/Net/State/Game.Data.cs index 5c47f91..9c21795 100644 --- a/src/Empostor.Server/Net/State/Game.Data.cs +++ b/src/Empostor.Server/Net/State/Game.Data.cs @@ -398,24 +398,18 @@ namespace Empostor.Server.Net.State { await _eventManager.CallAsync(new PlayerSpawnedEvent(this, player, control)); - // arrives before the PlayerControl spawn, so this fires immediately. The deadline is only a safety net for a client that never announces its scene. _ = Task.Run(async () => { try { - var deadline = DateTime.UtcNow.AddSeconds(10); - while (player.Scene != "OnlineGame") - { - if (DateTime.UtcNow > deadline - || !(player.Client.Connection?.IsConnected ?? false) - || GameState == GameStates.Destroyed) - { - return; - } + await Task.Delay(TimeSpan.FromMilliseconds(1500)); - await Task.Delay(100); + if (!(player.Client.Connection?.IsConnected ?? false)) + { + return; } + // From Nmpostor await _eventManager.CallAsync(new PlayerReadyEvent(this, player, control)); } catch (Exception ex)