diff --git a/QSB/Anglerfish/AnglerManager.cs b/QSB/Anglerfish/AnglerManager.cs index 09075d5b..a9819928 100644 --- a/QSB/Anglerfish/AnglerManager.cs +++ b/QSB/Anglerfish/AnglerManager.cs @@ -13,7 +13,7 @@ namespace QSB.Anglerfish public static readonly List Anglers = new(); - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { Anglers.Clear(); Anglers.AddRange(QSBWorldSync.GetUnityObjects().SortDeterministic()); diff --git a/QSB/Anglerfish/WorldObjects/QSBAngler.cs b/QSB/Anglerfish/WorldObjects/QSBAngler.cs index 8a84a86f..2f2ae88f 100644 --- a/QSB/Anglerfish/WorldObjects/QSBAngler.cs +++ b/QSB/Anglerfish/WorldObjects/QSBAngler.cs @@ -19,14 +19,14 @@ namespace QSB.Anglerfish.WorldObjects private Vector3 _lastTargetPosition; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { if (QSBCore.IsHost) { NetworkServer.Spawn(Object.Instantiate(QSBNetworkManager.singleton.AnglerPrefab)); } - await UniTask.WaitUntil(() => TransformSync, cancellationToken: cancellationToken); + await UniTask.WaitUntil(() => TransformSync, cancellationToken: ct); } public override void OnRemoval() diff --git a/QSB/Animation/NPC/CharacterAnimManager.cs b/QSB/Animation/NPC/CharacterAnimManager.cs index fd75263a..7c7780c5 100644 --- a/QSB/Animation/NPC/CharacterAnimManager.cs +++ b/QSB/Animation/NPC/CharacterAnimManager.cs @@ -10,7 +10,7 @@ namespace QSB.Animation.NPC // im assuming this is used in the eye as well public override WorldObjectType WorldObjectType => WorldObjectType.Both; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { QSBWorldSync.Init(); QSBWorldSync.Init(); diff --git a/QSB/CampfireSync/CampfireManager.cs b/QSB/CampfireSync/CampfireManager.cs index 612c15dd..926dbf9b 100644 --- a/QSB/CampfireSync/CampfireManager.cs +++ b/QSB/CampfireSync/CampfireManager.cs @@ -9,7 +9,7 @@ namespace QSB.CampfireSync { public override WorldObjectType WorldObjectType => WorldObjectType.Both; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); } } diff --git a/QSB/ConversationSync/ConversationManager.cs b/QSB/ConversationSync/ConversationManager.cs index 0f553827..0594ca61 100644 --- a/QSB/ConversationSync/ConversationManager.cs +++ b/QSB/ConversationSync/ConversationManager.cs @@ -39,7 +39,7 @@ namespace QSB.ConversationSync _boxPrefab.GetComponent().color = Color.white; } - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); public uint GetPlayerTalkingToTree(CharacterDialogueTree tree) diff --git a/QSB/EchoesOfTheEye/AirlockSync/AirlockManager.cs b/QSB/EchoesOfTheEye/AirlockSync/AirlockManager.cs index 27e16f34..cb4fbf39 100644 --- a/QSB/EchoesOfTheEye/AirlockSync/AirlockManager.cs +++ b/QSB/EchoesOfTheEye/AirlockSync/AirlockManager.cs @@ -10,6 +10,6 @@ namespace QSB.EchoesOfTheEye.AirlockSync // is this used in the prisoner sequence in the eye? public override WorldObjectType WorldObjectType => WorldObjectType.SolarSystem; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) => QSBWorldSync.Init(); + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); } } diff --git a/QSB/EchoesOfTheEye/LightSensorSync/LightSensorManager.cs b/QSB/EchoesOfTheEye/LightSensorSync/LightSensorManager.cs index ff00011a..85b8f332 100644 --- a/QSB/EchoesOfTheEye/LightSensorSync/LightSensorManager.cs +++ b/QSB/EchoesOfTheEye/LightSensorSync/LightSensorManager.cs @@ -10,6 +10,6 @@ namespace QSB.EchoesOfTheEye.LightSensorSync // see AirlockManager question public override WorldObjectType WorldObjectType => WorldObjectType.SolarSystem; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) => QSBWorldSync.Init(); + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); } } diff --git a/QSB/ElevatorSync/ElevatorManager.cs b/QSB/ElevatorSync/ElevatorManager.cs index 6d466577..1ff67f77 100644 --- a/QSB/ElevatorSync/ElevatorManager.cs +++ b/QSB/ElevatorSync/ElevatorManager.cs @@ -9,7 +9,7 @@ namespace QSB.ElevatorSync { public override WorldObjectType WorldObjectType => WorldObjectType.SolarSystem; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); } } \ No newline at end of file diff --git a/QSB/ElevatorSync/WorldObjects/QSBElevator.cs b/QSB/ElevatorSync/WorldObjects/QSBElevator.cs index 658b6a29..eb643d10 100644 --- a/QSB/ElevatorSync/WorldObjects/QSBElevator.cs +++ b/QSB/ElevatorSync/WorldObjects/QSBElevator.cs @@ -11,7 +11,7 @@ namespace QSB.ElevatorSync.WorldObjects { private OWTriggerVolume _elevatorTrigger; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { // BUG : This won't work for the log lift! need to make a different trigger for that diff --git a/QSB/EyeOfTheUniverse/InstrumentSync/QuantumInstrumentManager.cs b/QSB/EyeOfTheUniverse/InstrumentSync/QuantumInstrumentManager.cs index b755fe9e..17ff4787 100644 --- a/QSB/EyeOfTheUniverse/InstrumentSync/QuantumInstrumentManager.cs +++ b/QSB/EyeOfTheUniverse/InstrumentSync/QuantumInstrumentManager.cs @@ -9,7 +9,7 @@ namespace QSB.EyeOfTheUniverse.InstrumentSync { public override WorldObjectType WorldObjectType => WorldObjectType.Eye; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); } } diff --git a/QSB/GeyserSync/GeyserManager.cs b/QSB/GeyserSync/GeyserManager.cs index 6cc2a0c0..7ff2093c 100644 --- a/QSB/GeyserSync/GeyserManager.cs +++ b/QSB/GeyserSync/GeyserManager.cs @@ -9,7 +9,7 @@ namespace QSB.GeyserSync { public override WorldObjectType WorldObjectType => WorldObjectType.SolarSystem; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); } } \ No newline at end of file diff --git a/QSB/GeyserSync/WorldObjects/QSBGeyser.cs b/QSB/GeyserSync/WorldObjects/QSBGeyser.cs index 0d27d996..68dea07f 100644 --- a/QSB/GeyserSync/WorldObjects/QSBGeyser.cs +++ b/QSB/GeyserSync/WorldObjects/QSBGeyser.cs @@ -8,7 +8,7 @@ namespace QSB.GeyserSync.WorldObjects { public class QSBGeyser : WorldObject { - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { if (QSBCore.IsHost) { diff --git a/QSB/ItemSync/ItemManager.cs b/QSB/ItemSync/ItemManager.cs index 68a04e0a..f289e605 100644 --- a/QSB/ItemSync/ItemManager.cs +++ b/QSB/ItemSync/ItemManager.cs @@ -12,7 +12,7 @@ namespace QSB.ItemSync { public override WorldObjectType WorldObjectType => WorldObjectType.Both; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { DebugLog.DebugWrite("Building OWItems...", MessageType.Info); diff --git a/QSB/ItemSync/WorldObjects/Items/QSBItem.cs b/QSB/ItemSync/WorldObjects/Items/QSBItem.cs index 2447c90d..c186b97b 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBItem.cs @@ -18,7 +18,7 @@ namespace QSB.ItemSync.WorldObjects.Items private Quaternion InitialRotation { get; set; } private QSBSector InitialSector { get; set; } - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { if (AttachedObject == null) { diff --git a/QSB/JellyfishSync/JellyfishManager.cs b/QSB/JellyfishSync/JellyfishManager.cs index 3c6fb08e..ff2e29c2 100644 --- a/QSB/JellyfishSync/JellyfishManager.cs +++ b/QSB/JellyfishSync/JellyfishManager.cs @@ -13,7 +13,7 @@ namespace QSB.JellyfishSync public static readonly List Jellyfish = new(); - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { Jellyfish.Clear(); Jellyfish.AddRange(QSBWorldSync.GetUnityObjects().SortDeterministic()); diff --git a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs index bac0822f..2f5c1b85 100644 --- a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs +++ b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs @@ -15,15 +15,14 @@ namespace QSB.JellyfishSync.WorldObjects public JellyfishTransformSync TransformSync; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { if (QSBCore.IsHost) { NetworkServer.Spawn(Object.Instantiate(QSBNetworkManager.singleton.JellyfishPrefab)); } - StartDelayedReady(); - QSBCore.UnityEvents.RunWhen(() => TransformSync, FinishDelayedReady); + await UniTask.WaitUntil(() => TransformSync, cancellationToken: ct); } public override void OnRemoval() diff --git a/QSB/MeteorSync/MeteorManager.cs b/QSB/MeteorSync/MeteorManager.cs index d7a99bb3..fd687582 100644 --- a/QSB/MeteorSync/MeteorManager.cs +++ b/QSB/MeteorSync/MeteorManager.cs @@ -12,7 +12,7 @@ namespace QSB.MeteorSync public static WhiteHoleVolume WhiteHoleVolume; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { // wait for all late initializers (which includes meteor launchers) to finish StartDelayedReady(); diff --git a/QSB/MeteorSync/WorldObjects/QSBFragment.cs b/QSB/MeteorSync/WorldObjects/QSBFragment.cs index 1d4e9b3b..484d57a8 100644 --- a/QSB/MeteorSync/WorldObjects/QSBFragment.cs +++ b/QSB/MeteorSync/WorldObjects/QSBFragment.cs @@ -9,7 +9,7 @@ namespace QSB.MeteorSync.WorldObjects { public class QSBFragment : WorldObject { - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { DetachableFragment = AttachedObject.GetComponent(); diff --git a/QSB/OrbSync/OrbManager.cs b/QSB/OrbSync/OrbManager.cs index 83b97427..ef3f949f 100644 --- a/QSB/OrbSync/OrbManager.cs +++ b/QSB/OrbSync/OrbManager.cs @@ -13,7 +13,7 @@ namespace QSB.OrbSync public static readonly List Orbs = new(); - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { Orbs.Clear(); Orbs.AddRange(QSBWorldSync.GetUnityObjects().SortDeterministic()); diff --git a/QSB/OrbSync/WorldObjects/QSBOrb.cs b/QSB/OrbSync/WorldObjects/QSBOrb.cs index a3db3532..e6d428dc 100644 --- a/QSB/OrbSync/WorldObjects/QSBOrb.cs +++ b/QSB/OrbSync/WorldObjects/QSBOrb.cs @@ -16,7 +16,7 @@ namespace QSB.OrbSync.WorldObjects public NomaiOrbTransformSync TransformSync; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { if (QSBCore.IsHost) { diff --git a/QSB/PoolSync/PoolManager.cs b/QSB/PoolSync/PoolManager.cs index 6219d6ca..7f3bf94e 100644 --- a/QSB/PoolSync/PoolManager.cs +++ b/QSB/PoolSync/PoolManager.cs @@ -8,7 +8,7 @@ namespace QSB.PoolSync { public override WorldObjectType WorldObjectType => WorldObjectType.SolarSystem; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { foreach (var streaming in QSBWorldSync.GetUnityObjects()) { diff --git a/QSB/QuantumSync/QuantumManager.cs b/QSB/QuantumSync/QuantumManager.cs index 7084f27a..0b591dfa 100644 --- a/QSB/QuantumSync/QuantumManager.cs +++ b/QSB/QuantumSync/QuantumManager.cs @@ -22,7 +22,7 @@ namespace QSB.QuantumSync public void Awake() => QSBPlayerManager.OnRemovePlayer += PlayerLeave; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { DebugLog.DebugWrite("Building quantum objects...", MessageType.Info); QSBWorldSync.Init(); diff --git a/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs index 138e5fad..e48fc779 100644 --- a/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs @@ -13,9 +13,9 @@ namespace QSB.QuantumSync.WorldObjects public List QuantumStates { get; private set; } public int CurrentState => AttachedObject._stateIndex; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { - base.Init(cancellationToken); + base.Init(ct); StartDelayedReady(); QSBCore.UnityEvents.RunWhen(() => QSBWorldSync.AllObjectsAdded, () => diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs index dedf69fd..5d6bce6e 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs @@ -37,7 +37,7 @@ namespace QSB.QuantumSync.WorldObjects } } - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { StartDelayedReady(); QSBCore.UnityEvents.FireInNUpdates(LateInit, 5); diff --git a/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs index 4feb1f88..85d0f89d 100644 --- a/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs @@ -11,9 +11,9 @@ namespace QSB.QuantumSync.WorldObjects { internal class QSBSocketedQuantumObject : QSBQuantumObject { - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { - base.Init(cancellationToken); + base.Init(ct); AttachedObject._randomYRotation = false; } diff --git a/QSB/SectorSync/QSBSectorManager.cs b/QSB/SectorSync/QSBSectorManager.cs index 893dfe8d..a2a74eaa 100644 --- a/QSB/SectorSync/QSBSectorManager.cs +++ b/QSB/SectorSync/QSBSectorManager.cs @@ -70,7 +70,7 @@ namespace QSB.SectorSync DebugLog.DebugWrite("Sector Manager ready.", MessageType.Success); } - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { DebugLog.DebugWrite("Building sectors...", MessageType.Info); if (QSBSceneManager.CurrentScene == OWScene.SolarSystem) diff --git a/QSB/SectorSync/WorldObjects/QSBSector.cs b/QSB/SectorSync/WorldObjects/QSBSector.cs index f3f3036f..da7a60bf 100644 --- a/QSB/SectorSync/WorldObjects/QSBSector.cs +++ b/QSB/SectorSync/WorldObjects/QSBSector.cs @@ -29,7 +29,7 @@ namespace QSB.SectorSync.WorldObjects public bool IsFakeSector => AttachedObject is FakeSector; public FakeSector FakeSector => (FakeSector)AttachedObject; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { if (IsFakeSector) { diff --git a/QSB/ShipSync/ShipManager.cs b/QSB/ShipSync/ShipManager.cs index adcd67a6..69b1f98a 100644 --- a/QSB/ShipSync/ShipManager.cs +++ b/QSB/ShipSync/ShipManager.cs @@ -45,7 +45,7 @@ namespace QSB.ShipSync public void Start() => Instance = this; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { var shipTransform = GameObject.Find("Ship_Body"); if (shipTransform == null) diff --git a/QSB/Tools/ProbeLauncherTool/ProbeLauncherManager.cs b/QSB/Tools/ProbeLauncherTool/ProbeLauncherManager.cs index ed047010..5a0fdc78 100644 --- a/QSB/Tools/ProbeLauncherTool/ProbeLauncherManager.cs +++ b/QSB/Tools/ProbeLauncherTool/ProbeLauncherManager.cs @@ -10,7 +10,7 @@ namespace QSB.Tools.ProbeLauncherTool { public override WorldObjectType WorldObjectType => WorldObjectType.Both; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { QSBWorldSync.Init(typeof(PlayerProbeLauncher)); if (scene == OWScene.SolarSystem) diff --git a/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs b/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs index 0e701e24..79b5ab65 100644 --- a/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs +++ b/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs @@ -8,7 +8,7 @@ namespace QSB.Tools.ProbeLauncherTool.WorldObjects { internal class QSBProbeLauncher : WorldObject { - public override async UniTask Init(CancellationToken cancellationToken) => + public override async UniTask Init(CancellationToken ct) => AttachedObject.OnLaunchProbe += OnLaunchProbe; public override void OnRemoval() => diff --git a/QSB/Tools/TranslatorTool/TranslationSync/SpiralManager.cs b/QSB/Tools/TranslatorTool/TranslationSync/SpiralManager.cs index 1bfd9c8d..0b78f180 100644 --- a/QSB/Tools/TranslatorTool/TranslationSync/SpiralManager.cs +++ b/QSB/Tools/TranslatorTool/TranslationSync/SpiralManager.cs @@ -9,7 +9,7 @@ namespace QSB.Tools.TranslatorTool.TranslationSync { public override WorldObjectType WorldObjectType => WorldObjectType.Both; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { // wait for all late initializers (which includes nomai text) to finish StartDelayedReady(); diff --git a/QSB/TornadoSync/TornadoManager.cs b/QSB/TornadoSync/TornadoManager.cs index 6fc2e0d2..2ab8baec 100644 --- a/QSB/TornadoSync/TornadoManager.cs +++ b/QSB/TornadoSync/TornadoManager.cs @@ -12,7 +12,7 @@ namespace QSB.TornadoSync { public override WorldObjectType WorldObjectType => WorldObjectType.SolarSystem; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { QSBWorldSync.Init(); diff --git a/QSB/TriggerSync/TriggerManager.cs b/QSB/TriggerSync/TriggerManager.cs index b65422e8..a0feda01 100644 --- a/QSB/TriggerSync/TriggerManager.cs +++ b/QSB/TriggerSync/TriggerManager.cs @@ -9,7 +9,7 @@ namespace QSB.TriggerSync { public override WorldObjectType WorldObjectType => WorldObjectType.Both; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) { QSBWorldSync.Init(x => x.playerTrackingZone); QSBWorldSync.Init(x => x._watchPlayerVolume); diff --git a/QSB/TriggerSync/WorldObjects/QSBCharacterTrigger.cs b/QSB/TriggerSync/WorldObjects/QSBCharacterTrigger.cs index e4b48296..3b04880e 100644 --- a/QSB/TriggerSync/WorldObjects/QSBCharacterTrigger.cs +++ b/QSB/TriggerSync/WorldObjects/QSBCharacterTrigger.cs @@ -5,9 +5,9 @@ namespace QSB.TriggerSync.WorldObjects { public class QSBCharacterTrigger : QSBTrigger { - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { - await base.Init(cancellationToken); + await base.Init(ct); AttachedObject.OnEntry -= TriggerOwner.OnZoneEntry; AttachedObject.OnExit -= TriggerOwner.OnZoneExit; } diff --git a/QSB/TriggerSync/WorldObjects/QSBInflationTrigger.cs b/QSB/TriggerSync/WorldObjects/QSBInflationTrigger.cs index 2a8bf052..31e329c3 100644 --- a/QSB/TriggerSync/WorldObjects/QSBInflationTrigger.cs +++ b/QSB/TriggerSync/WorldObjects/QSBInflationTrigger.cs @@ -9,9 +9,9 @@ namespace QSB.TriggerSync.WorldObjects { protected override string CompareTag => "PlayerCameraDetector"; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { - base.Init(cancellationToken); + base.Init(ct); AttachedObject.OnEntry -= TriggerOwner.OnEnterFogSphere; AttachedObject.OnExit -= OnExitEvent; } diff --git a/QSB/TriggerSync/WorldObjects/QSBMaskZoneTrigger.cs b/QSB/TriggerSync/WorldObjects/QSBMaskZoneTrigger.cs index 5ffdb6f3..a095292f 100644 --- a/QSB/TriggerSync/WorldObjects/QSBMaskZoneTrigger.cs +++ b/QSB/TriggerSync/WorldObjects/QSBMaskZoneTrigger.cs @@ -6,9 +6,9 @@ namespace QSB.TriggerSync.WorldObjects { public class QSBMaskZoneTrigger : QSBTrigger { - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { - base.Init(cancellationToken); + base.Init(ct); AttachedObject.OnEntry -= TriggerOwner.OnEnterMaskZone; AttachedObject.OnExit -= TriggerOwner.OnExitMaskZone; } diff --git a/QSB/TriggerSync/WorldObjects/QSBSolanumTrigger.cs b/QSB/TriggerSync/WorldObjects/QSBSolanumTrigger.cs index 57601ae2..ef315b78 100644 --- a/QSB/TriggerSync/WorldObjects/QSBSolanumTrigger.cs +++ b/QSB/TriggerSync/WorldObjects/QSBSolanumTrigger.cs @@ -5,9 +5,9 @@ namespace QSB.TriggerSync.WorldObjects { public class QSBSolanumTrigger : QSBTrigger { - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { - base.Init(cancellationToken); + base.Init(ct); AttachedObject.OnEntry -= TriggerOwner.OnEnterWatchVolume; AttachedObject.OnExit -= TriggerOwner.OnExitWatchVolume; } diff --git a/QSB/TriggerSync/WorldObjects/QSBTrigger.cs b/QSB/TriggerSync/WorldObjects/QSBTrigger.cs index 923b23ca..bb640949 100644 --- a/QSB/TriggerSync/WorldObjects/QSBTrigger.cs +++ b/QSB/TriggerSync/WorldObjects/QSBTrigger.cs @@ -27,7 +27,7 @@ namespace QSB.TriggerSync.WorldObjects protected virtual string CompareTag => "PlayerDetector"; - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { AttachedObject.OnEntry += OnEnterEvent; AttachedObject.OnExit += OnExitEvent; diff --git a/QSB/TriggerSync/WorldObjects/QSBVesselCageTrigger.cs b/QSB/TriggerSync/WorldObjects/QSBVesselCageTrigger.cs index 25d82c78..08a61df3 100644 --- a/QSB/TriggerSync/WorldObjects/QSBVesselCageTrigger.cs +++ b/QSB/TriggerSync/WorldObjects/QSBVesselCageTrigger.cs @@ -7,9 +7,9 @@ namespace QSB.TriggerSync.WorldObjects { public class QSBVesselCageTrigger : QSBTrigger { - public override async UniTask Init(CancellationToken cancellationToken) + public override async UniTask Init(CancellationToken ct) { - base.Init(cancellationToken); + base.Init(ct); AttachedObject.OnExit -= TriggerOwner.OnExitCageTrigger; } diff --git a/QSB/WorldSync/WorldObject.cs b/QSB/WorldSync/WorldObject.cs index 3d28318e..13d1d34d 100644 --- a/QSB/WorldSync/WorldObject.cs +++ b/QSB/WorldSync/WorldObject.cs @@ -13,7 +13,7 @@ namespace QSB.WorldSync public string Name => AttachedObject ? AttachedObject.name : ""; public override string ToString() => $"{ObjectId}:{GetType().Name} ({Name})"; - public virtual async UniTask Init(CancellationToken cancellationToken) { } + public virtual async UniTask Init(CancellationToken ct) { } public virtual void OnRemoval() { } public virtual bool ShouldDisplayDebug() => QSBWorldSync.AllObjectsReady && AttachedObject && AttachedObject.gameObject.activeInHierarchy; public virtual string ReturnLabel() => ToString(); diff --git a/QSB/WorldSync/WorldObjectManager.cs b/QSB/WorldSync/WorldObjectManager.cs index 8f4cc336..f6b152c6 100644 --- a/QSB/WorldSync/WorldObjectManager.cs +++ b/QSB/WorldSync/WorldObjectManager.cs @@ -18,7 +18,7 @@ namespace QSB.WorldSync /// public abstract WorldObjectType WorldObjectType { get; } - public abstract UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken); + public abstract UniTask BuildWorldObjects(OWScene scene, CancellationToken ct); public virtual void UnbuildWorldObjects() { } diff --git a/QSB/ZeroGCaveSync/ZeroGCaveManager.cs b/QSB/ZeroGCaveSync/ZeroGCaveManager.cs index 338fcc97..21fb9119 100644 --- a/QSB/ZeroGCaveSync/ZeroGCaveManager.cs +++ b/QSB/ZeroGCaveSync/ZeroGCaveManager.cs @@ -9,7 +9,7 @@ namespace QSB.ZeroGCaveSync { public override WorldObjectType WorldObjectType => WorldObjectType.SolarSystem; - public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken cancellationToken) + public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct) => QSBWorldSync.Init(); } }