Fixes

Michal78900 · Aug 31, 2021 · 06769c6 · 06769c6
1 parent b9d991d
commit 06769c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/WaitAndChillReborn/Handler.cs b/WaitAndChillReborn/Handler.cs
@@ -20,8 +20,11 @@ internal void OnWaitingForPlayers()
             Scp173.TurnedPlayers.Clear();
             Scp096.TurnedPlayers.Clear();
 
-            ffPrevValue = Server.FriendlyFire;
-            Server.FriendlyFire = true;
+            if (Config.AllowFriendlyFire)
+            {
+                ffPrevValue = Server.FriendlyFire;
+                Server.FriendlyFire = true;
+            }
 
             GameObject.Find("StartRound").transform.localScale = Vector3.zero;
 
@@ -164,14 +167,6 @@ internal void OnDroppingItem(DroppingItemEventArgs ev)
             }
         }
 
-        internal void OnPickingupItem(PickingUpItemEventArgs ev)
-        {
-            if (ev.Player.Role == RoleType.ClassD)
-            {
-                ev.IsAllowed = false;
-            }
-        }
-
         internal void OnInteractingDoor(InteractingDoorEventArgs ev)
         {
             if (IsLobby)
@@ -216,7 +211,8 @@ internal void OnTeleporting(TeleportingEventArgs ev)
 
         internal void OnRoundStarted()
         {
-            Server.FriendlyFire = ffPrevValue;
+            if (Config.AllowFriendlyFire)
+                Server.FriendlyFire = ffPrevValue;
 
             foreach (ThrownProjectile throwable in Object.FindObjectsOfType<ThrownProjectile>())
             {

diff --git a/WaitAndChillReborn/Plugin.cs b/WaitAndChillReborn/Plugin.cs
@@ -36,7 +36,6 @@ public override void OnEnabled()
             PlayerEvent.SpawningRagdoll += handler.OnSpawningRagdoll;
             PlayerEvent.IntercomSpeaking += handler.OnIntercom;
             PlayerEvent.DroppingItem += handler.OnDroppingItem;
-            PlayerEvent.PickingUpItem += handler.OnPickingupItem;
             PlayerEvent.InteractingDoor += handler.OnInteractingDoor;
             PlayerEvent.InteractingElevator += handler.OnInteractingElevator;
             PlayerEvent.InteractingLocker += handler.OnInteractingLocker;
@@ -62,7 +61,6 @@ public override void OnDisabled()
             PlayerEvent.SpawningRagdoll -= handler.OnSpawningRagdoll;
             PlayerEvent.IntercomSpeaking -= handler.OnIntercom;
             PlayerEvent.DroppingItem -= handler.OnDroppingItem;
-            PlayerEvent.PickingUpItem -= handler.OnPickingupItem;
             PlayerEvent.InteractingDoor -= handler.OnInteractingDoor;
             PlayerEvent.InteractingElevator -= handler.OnInteractingElevator;
             PlayerEvent.InteractingLocker -= handler.OnInteractingLocker;
@@ -80,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, 0);
+        public override Version Version => new Version(3, 0, 1);
         public override Version RequiredExiledVersion => new Version(3, 0, 0);
     }
 }