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

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

Browse Source
This commit is contained in:
JohnCorby 2022-04-02 14:32:01 -07:00
parent 6d8d3ea9ff
commit e125258fde
1 changed files with 7 additions and 3 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 (PlayerTransformSync.LocalInstance == null ||
player.PlayerId < QSBPlayerManager.LocalPlayerId)
player.PlayerId < QSBPlayerManager.LocalPlayerId)
{
// player was here before we joined
return;
@ -34,7 +34,11 @@ public static class JoinLeaveSingularity
}
var go = new GameObject($"player {player} JoinLeaveSingularity");
var ct = go.GetCancellationTokenOnDestroy();
var ct = CancellationTokenSource.CreateLinkedTokenSource(
go.GetCancellationTokenOnDestroy(),
player.TransformSync.GetCancellationTokenOnDestroy(),
player.Body.GetCancellationTokenOnDestroy()
).Token;
UniTask.Create(async () =>
{
DebugLog.DebugWrite($"{go.name}: WARP TASK");
@ -142,4 +146,4 @@ public static class JoinLeaveSingularity
};
await UniTask.WaitUntil(() => !effect.enabled && !singularity._owOneShotSource.isPlaying, cancellationToken: ct);
}
}
}