Fixed the crash bug

Michal78900 · Sep 18, 2021 · 982119b · 982119b
1 parent 42dc774
commit 982119b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git 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<ThrownProjectile>())
             {
+                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<Vector3> possibleSpawnPoses = new List<Vector3>();
 
-        private Vector3 ChoosedSpawnPos;
+        private Vector3 choosedSpawnPos;
 
         private CoroutineHandle lobbyTimer;
 

diff --git 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
@@ -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
@@ -47,28 +47,28 @@
       <HintPath>..\..\..\Desktop\Exiled\CommandSystem.Core.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.API, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.API.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.API.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Bootstrap, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Bootstrap.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Bootstrap.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.CreditTags, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.CreditTags.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CreditTags.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.CustomItems, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.CustomItems.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CustomItems.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Events, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Events.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Events.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Loader, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Loader.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Loader.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Permissions, Version=3.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Permissions.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Permissions.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.82\lib\net472\Exiled.Updater.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Updater.dll</HintPath>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/WaitAndChillReborn/packages.config b/WaitAndChillReborn/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EXILED" version="3.0.0-alpha.82" targetFramework="net472" />
+  <package id="EXILED" version="3.0.0-alpha.84" targetFramework="net472" />
 </packages>