Revert "Fetch upstream (#2357)"

This reverts commit 33edca9.
Exiled-Team · Jan 12, 2024 · 181c1cb · 181c1cb
1 parent 96ff024
commit 181c1cb
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 24 deletions.
diff --git a/Exiled.API/Enums/SpawnReason.cs b/Exiled.API/Enums/SpawnReason.cs
@@ -53,13 +53,8 @@ public enum SpawnReason : byte // TOTO: Remove this file and use Basegame
         ForceClass,
 
         /// <summary>
-        /// The player will be destroyed.
+        /// The user will be destroyed.
         /// </summary>
         Destroyed,
-
-        /// <summary>
-        /// The player was spawned due to the usage of an item.
-        /// </summary>
-        ItemUsage,
     }
-}
+}
diff --git a/Exiled.API/Features/DamageHandlers/AttackerDamageHandler.cs b/Exiled.API/Features/DamageHandlers/AttackerDamageHandler.cs
@@ -8,7 +8,6 @@
 namespace Exiled.API.Features.DamageHandlers
 {
     using CustomPlayerEffects;
-    using PlayerRoles;
 
     using BaseHandler = PlayerStatsSystem.DamageHandlerBase;
 

diff --git a/Exiled.API/Features/Roles/Scp1507Role.cs b/Exiled.API/Features/Roles/Scp1507Role.cs
@@ -9,8 +9,6 @@ namespace Exiled.API.Features.Roles
 {
     using System.Collections.Generic;
     using System.Linq;
-
-    using Exiled.API.Enums;
     using Exiled.API.Interfaces;
     using PlayerRoles;
     using PlayerRoles.PlayableScps.HumeShield;

diff --git a/Exiled.API/Features/Scp1507Ragdoll.cs b/Exiled.API/Features/Scp1507Ragdoll.cs
@@ -1,5 +1,4 @@
 // -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
 // <copyright file="Scp1507Ragdoll.cs" company="Exiled Team">
 // Copyright (c) Exiled Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.

diff --git a/Exiled.API/Features/Scp956.cs b/Exiled.API/Features/Scp956.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 // <copyright file="Scp956.cs" company="Exiled Team">
 // Copyright (c) Exiled Team. All rights reserved.
 // Licensed under the CC BY-SA 3.0 license.

diff --git a/Exiled.CustomItems/API/Features/CustomWeapon.cs b/Exiled.CustomItems/API/Features/CustomWeapon.cs
@@ -197,16 +197,6 @@ private void OnInternalReloading(ReloadingWeaponEventArgs ev)
             if (!Check(ev.Player.CurrentItem))
                 return;
 
-            Log.Debug($"{nameof(Name)}.{nameof(OnInternalReloading)}: Reloading weapon. Calling external reload event..");
-            OnReloading(ev);
-
-            Log.Debug($"{nameof(Name)}.{nameof(OnInternalReloading)}: External event ended. {ev.IsAllowed}");
-            if (!ev.IsAllowed)
-            {
-                Log.Debug($"{nameof(Name)}.{nameof(OnInternalReloading)}: External event turned is allowed to false, returning.");
-                return;
-            }
-
             Log.Debug($"{nameof(Name)}.{nameof(OnInternalReloading)}: Continuing with internal reload..");
             ev.IsAllowed = false;
 
@@ -310,4 +300,4 @@ private void OnInternalHurting(HurtingEventArgs ev)
             OnHurting(ev);
         }
     }
-}
+}
diff --git a/Exiled.Events/Patches/Events/Scp2536/FindingPosition.cs b/Exiled.Events/Patches/Events/Scp2536/FindingPosition.cs
@@ -16,7 +16,6 @@ namespace Exiled.Events.Patches.Events.Scp2536
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp2536;
     using HarmonyLib;
-    using UnityEngine;
 
     using static HarmonyLib.AccessTools;