Fetch upstream (#2357)

* Update halloween.yml * Rename halloween.yml to xmas.yml * Xmas update (#2339) * Update RoundEnd.cs (#2341) * Lots of new API (#2342) * lots of new new effects 956 559 * final * fix * idk * Scp956Target * Snowed * doc --------- Co-authored-by: Yamato <louismonneyron5@yahoo.com> * DamageHandler and Flamingo (#2343) * DamageHandler and Flamingo * Update ItemExtension * Missing Scp1507Damage * Missing Item API * Snow pile (#2346) * snow pile * list fix --------- Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> * SCP-1507 (#2340) * scp-1507 * minor changes * added role * new * IHumeShieldRole * . --------- Co-authored-by: Yamato <louismonneyron5@yahoo.com> Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> * CustomWeaponFix (#2349) * CustomWeaponFix * Fix * More features and events for SCP-1507 (#2348) * scp-1507 * minor changes * added role * new * IHumeShieldRole * . * lots of new * still something new * Update Scp1507Role.cs * Update Scp1507Role.cs --------- Co-authored-by: Yamato <louismonneyron5@yahoo.com> Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> * SCP-2536 (#2344) * base 2536 * ev * trying fix * fix + new ev * WhitelistedTeams * doc change --------- Co-authored-by: Yamato <louismonneyron5@yahoo.com> Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> * 8.4.4-beta.1 * Fix nuget deps * ooops (#2351) * Fix CustomItem * Fixing scp that can attack each other (#2352) * Fixing scp that can attack each other * Update IndividualFriendlyFire.cs * bump * SpawnReason::ItemUsage * Fix CustomItem::OnReloading(ev) * - (#2354) Co-authored-by: Nao <60253860+NaoUnderscore@users.noreply.github.com> * SpawnReasons::Vocalize (#2355) * Update SpawnReason.cs Added new SpawnReason for SCP-1507 * Update SpawnReason.cs --------- Co-authored-by: Nao <60253860+NaoUnderscore@users.noreply.github.com> * Removed SpawnReason::Vocalize (#2356) They pointed out to me that nw doesn't use "Vocalize" but uses "Revived" --------- Co-authored-by: Misaka-ZeroTwo <45165615+Misaka-ZeroTwo@users.noreply.github.com> Co-authored-by: VALERA771 <72030575+VALERA771@users.noreply.github.com> Co-authored-by: Yamato <louismonneyron5@yahoo.com> Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com> Co-authored-by: Bolton <48883340+BoltonDev@users.noreply.github.com> Co-authored-by: Nao <github@naoudnerscore.dev> Co-authored-by: INZI <98975836+InziDeveloperMode@users.noreply.github.com>
Exiled-Team · Dec 24, 2023 · 33edca9 · 33edca9
1 parent 28513e5
commit 33edca9
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 5 deletions.
diff --git a/Exiled.API/Enums/SpawnReason.cs b/Exiled.API/Enums/SpawnReason.cs
@@ -53,8 +53,13 @@ public enum SpawnReason : byte // TOTO: Remove this file and use Basegame
         ForceClass,
 
         /// <summary>
-        /// The user will be destroyed.
+        /// The player 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,6 +8,7 @@
 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,6 +9,8 @@ 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,4 +1,5 @@
 // -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 // <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.
@@ -105,6 +105,6 @@ public static IEnumerable<ZoneType> AvailableZones
         /// Spawns behind the specified target.
         /// </summary>
         /// <param name="target">Player to spawn. If <paramref name="target"/> is <see langword="null"/>, will be chosen random.</param>
-        public static void SpawnBehindTarget(Player target = null) => Singleton.SpawnBehindTarget((target ?? Player.List.Random()).ReferenceHub);
+        public static void SpawnBehindTarget(Player target = null) => Singleton.SpawnBehindTarget((target ?? Player.List.GetRandomValue()).ReferenceHub);
     }
 }
diff --git a/Exiled.CustomItems/API/Features/CustomWeapon.cs b/Exiled.CustomItems/API/Features/CustomWeapon.cs
@@ -197,6 +197,16 @@ 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;
 
@@ -300,4 +310,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,6 +16,7 @@ namespace Exiled.Events.Patches.Events.Scp2536
     using Exiled.Events.Attributes;
     using Exiled.Events.EventArgs.Scp2536;
     using HarmonyLib;
+    using UnityEngine;
 
     using static HarmonyLib.AccessTools;