diff --git a/WaitAndChillReborn/Handler.cs b/WaitAndChillReborn/Handler.cs index 79208b1..4b98ef2 100644 --- a/WaitAndChillReborn/Handler.cs +++ b/WaitAndChillReborn/Handler.cs @@ -74,7 +74,7 @@ internal void OnVerified(VerifiedEventArgs ev) { if (!Config.MultipleRooms) { - ev.Player.Position = ChoosedSpawnPos; + ev.Player.Position = choosedSpawnPos; } else { @@ -116,7 +116,7 @@ internal void OnDied(DiedEventArgs ev) { if (!Config.MultipleRooms) { - ev.Target.Position = ChoosedSpawnPos; + ev.Target.Position = choosedSpawnPos; } else { @@ -233,6 +233,9 @@ internal void OnRoundStarted() foreach (ThrownProjectile throwable in Object.FindObjectsOfType()) { + if (throwable is Scp018Projectile scp018 && scp018.Rb.velocity.sqrMagnitude <= 1f) + continue; + throwable.transform.position = Vector3.zero; Timing.CallDelayed(1f, () => NetworkServer.Destroy(throwable?.gameObject)); } @@ -282,7 +285,7 @@ internal void OnRoundStarted() private List possibleSpawnPoses = new List(); - private Vector3 ChoosedSpawnPos; + private Vector3 choosedSpawnPos; private CoroutineHandle lobbyTimer; diff --git a/WaitAndChillReborn/Methods.cs b/WaitAndChillReborn/Methods.cs index 98f3ca9..0b00b66 100644 --- a/WaitAndChillReborn/Methods.cs +++ b/WaitAndChillReborn/Methods.cs @@ -178,7 +178,7 @@ internal void SpawnManager() } } - ChoosedSpawnPos = possibleSpawnPoses[Random.Range(0, possibleSpawnPoses.Count)]; + choosedSpawnPos = possibleSpawnPoses[Random.Range(0, possibleSpawnPoses.Count)]; } internal void Scp079sDoors(bool state) diff --git a/WaitAndChillReborn/Plugin.cs b/WaitAndChillReborn/Plugin.cs index 01cbc3f..bac6340 100644 --- a/WaitAndChillReborn/Plugin.cs +++ b/WaitAndChillReborn/Plugin.cs @@ -78,7 +78,7 @@ public override void OnDisabled() public override string Name => "WaitAndChillReborn"; public override string Author => "Michal78900"; - public override Version Version => new Version(3, 0, 3); + public override Version Version => new Version(3, 0, 4); public override Version RequiredExiledVersion => new Version(3, 0, 0); } } diff --git a/WaitAndChillReborn/WaitAndChillReborn.csproj b/WaitAndChillReborn/WaitAndChillReborn.csproj index a023449..d7e2fc1 100644 --- a/WaitAndChillReborn/WaitAndChillReborn.csproj +++ b/WaitAndChillReborn/WaitAndChillReborn.csproj @@ -47,28 +47,28 @@ ..\..\..\Desktop\Exiled\CommandSystem.Core.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.API.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.API.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Bootstrap.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Bootstrap.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.CreditTags.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CreditTags.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.CustomItems.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CustomItems.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Events.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Events.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Loader.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Loader.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Permissions.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Permissions.dll - ..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Updater.dll + ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Updater.dll False diff --git a/WaitAndChillReborn/packages.config b/WaitAndChillReborn/packages.config index 5470aa9..c8b8dcc 100644 --- a/WaitAndChillReborn/packages.config +++ b/WaitAndChillReborn/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file