mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-29 09:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Revert "JoinLeaveSingularity: also cancel task if transform sync or player body gets destroyed"

Browse Source 
This reverts commit e125258fdeb7da74eaa92917871b2ee2cfc99dcd.
This commit is contained in:
JohnCorby 2022-04-03 13:08:01 -07:00
parent e125258fde
commit 67f390a7ef
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
QSB/Player/JoinLeaveSingularity.cs
View File

@ -19,7 +19,7 @@ public static class JoinLeaveSingularity
if (joining) if (joining)
{ {
if (PlayerTransformSync.LocalInstance == null || if (PlayerTransformSync.LocalInstance == null ||
player.PlayerId < QSBPlayerManager.LocalPlayerId) player.PlayerId < QSBPlayerManager.LocalPlayerId)
{ {
// player was here before we joined // player was here before we joined
return; return;
@ -34,11 +34,7 @@ public static class JoinLeaveSingularity
} }
var go = new GameObject($"player {player} JoinLeaveSingularity"); var go = new GameObject($"player {player} JoinLeaveSingularity");
var ct = CancellationTokenSource.CreateLinkedTokenSource( var ct = go.GetCancellationTokenOnDestroy();
go.GetCancellationTokenOnDestroy(),
player.TransformSync.GetCancellationTokenOnDestroy(),
player.Body.GetCancellationTokenOnDestroy()
).Token;
UniTask.Create(async () => UniTask.Create(async () =>
{ {
DebugLog.DebugWrite($"{go.name}: WARP TASK"); DebugLog.DebugWrite($"{go.name}: WARP TASK");
@ -146,4 +142,4 @@ public static class JoinLeaveSingularity
}; };
await UniTask.WaitUntil(() => !effect.enabled && !singularity._owOneShotSource.isPlaying, cancellationToken: ct); await UniTask.WaitUntil(() => !effect.enabled && !singularity._owOneShotSource.isPlaying, cancellationToken: ct);
} }
} }