Merge branch 'dev' into NWBugsFix

Author: louis1706

EXILED/Exiled.API/Features/Items/Jailbird.cs

@@ -7,11 +7,14 @@
 
 namespace Exiled.API.Features.Items
 {
+    using System;
+
     using Exiled.API.Features.Pickups;
     using Exiled.API.Interfaces;
     using InventorySystem.Items.Autosync;
     using InventorySystem.Items.Jailbird;
     using Mirror;
+    using UnityEngine;
 
     using JailbirdPickup = Pickups.JailbirdPickup;
 
@@ -114,12 +117,35 @@ public JailbirdWearState WearState
             get => Base._deterioration.WearState;
             set
             {
-                if (JailbirdDeteriorationTracker.ReceivedStates.ContainsKey(Serial))
-                    JailbirdDeteriorationTracker.ReceivedStates[Serial] = value;
+                TotalDamageDealt = GetDamage(value);
+                TotalCharges = GetCharge(value);
                 Base._deterioration.RecheckUsage();
             }
         }
 
+        /// <summary>
+        /// Calculates the damage corresponding to a given <see cref="JailbirdWearState"/>.
+        /// </summary>
+        /// <param name="wearState">The wear state to calculate damage for.</param>
+        /// <returns>The amount of damage associated with the specified wear state.</returns>
+        public float GetDamage(JailbirdWearState wearState)
+        {
+            foreach (Keyframe keyframe in Base._deterioration._damageToWearState.keys)
+            {
+                if (Base._deterioration.FloatToState(keyframe.value) == wearState)
+                    return keyframe.time;
+            }
+
+            throw new Exception("Wear state not found in damage to wear state mapping.");
+        }
+
+        /// <summary>
+        /// Gets the charge needed to reach a specific <see cref="JailbirdWearState"/>.
+        /// </summary>
+        /// <param name="wearState">The desired wear state to calculate the charge for.</param>
+        /// <returns>The charge value required to achieve the specified wear state.</returns>
+        public int GetCharge(JailbirdWearState wearState) => (int)wearState;
+
         /// <summary>
         /// Breaks the Jailbird.
         /// </summary>

EXILED/Exiled.API/Features/Map.cs

@@ -57,11 +57,6 @@ public static class Map
         /// </summary>
         internal static readonly List<PocketDimensionTeleport> TeleportsValue = new(8);
 
-        /// <summary>
-        /// A list of <see cref="AdminToy"/>s on the map.
-        /// </summary>
-        internal static readonly List<AdminToy> ToysValue = new();
-
         private static TantrumEnvironmentalHazard tantrumPrefab;
         private static Scp939AmnesticCloudInstance amnesticCloudPrefab;
 
@@ -130,7 +125,7 @@ DecontaminationController.Singleton.NetworkDecontaminationOverride is Decontamin
         /// <summary>
         /// Gets all <see cref="AdminToy"/> objects.
         /// </summary>
-        public static ReadOnlyCollection<AdminToy> Toys { get; } = ToysValue.AsReadOnly();
+        public static ReadOnlyCollection<AdminToy> Toys => AdminToy.BaseToAdminToy.Values.ToList().AsReadOnly(); // TODO: Obsolete it and make people use AdminToy.List
 
         /// <summary>
         /// Gets or sets the current seed of the map.

EXILED/Exiled.API/Features/Player.cs

@@ -1266,8 +1266,13 @@ public static Player Get(GameObject gameObject)
             if (Dictionary.TryGetValue(gameObject, out Player player))
                 return player;
 
-            UnverifiedPlayers.TryGetValue(gameObject, out player);
-            return player;
+            if (UnverifiedPlayers.TryGetValue(gameObject, out player))
+                return player;
+
+            if (ReferenceHub.TryGetHub(gameObject, out ReferenceHub hub))
+                return new(hub);
+
+            return null;
         }
 
         /// <summary>
@@ -2319,6 +2324,16 @@ public void Broadcast(ushort duration, string message, global::Broadcast.Broadca
         public void AddAmmo(AmmoType ammoType, ushort amount) =>
             Inventory.ServerAddAmmo(ammoType.GetItemType(), amount);
 
+        /// <summary>
+        /// Adds the amount of a specified <see cref="AmmoType">ammo type</see> to player's inventory.
+        /// </summary>
+        /// <param name="ammoBag">A dictionary of <see cref="AmmoType">ammo types</see> that will be added.</param>
+        public void AddAmmo(Dictionary<AmmoType, ushort> ammoBag)
+        {
+            foreach (KeyValuePair<AmmoType, ushort> kvp in ammoBag)
+                AddAmmo(kvp.Key, kvp.Value);
+        }
+
         /// <summary>
         /// Adds the amount of a weapon's <see cref="AmmoType">ammo type</see> to the player's inventory.
         /// </summary>
@@ -2338,6 +2353,16 @@ public void SetAmmo(AmmoType ammoType, ushort amount)
                 Inventory.ServerSetAmmo(itemType, amount);
         }
 
+        /// <summary>
+        /// Sets the amount of a specified <see cref="AmmoType">ammo type</see> to player's inventory.
+        /// </summary>
+        /// <param name="ammoBag">A dictionary of <see cref="AmmoType">ammo types</see> that will be added.</param>
+        public void SetAmmo(Dictionary<AmmoType, ushort> ammoBag)
+        {
+            foreach (KeyValuePair<AmmoType, ushort> kvp in ammoBag)
+                SetAmmo(kvp.Key, kvp.Value);
+        }
+
         /// <summary>
         /// Gets the ammo count of a specified <see cref="AmmoType">ammo type</see> in a player's inventory.
         /// </summary>

EXILED/Exiled.API/Features/Toys/AdminToy.cs

@@ -7,13 +7,15 @@
 
 namespace Exiled.API.Features.Toys
 {
+    using System.Collections.Generic;
     using System.Linq;
 
     using AdminToys;
 
     using Enums;
     using Exiled.API.Interfaces;
     using Footprinting;
+    using InventorySystem.Items;
     using Mirror;
 
     using UnityEngine;
@@ -23,6 +25,11 @@ namespace Exiled.API.Features.Toys
     /// </summary>
     public abstract class AdminToy : IWorldSpace
     {
+        /// <summary>
+        /// A dictionary of all <see cref="AdminToys.AdminToyBase"/>'s that have been converted into <see cref="AdminToy"/>.
+        /// </summary>
+        internal static readonly Dictionary<AdminToyBase, AdminToy> BaseToAdminToy = new(new ComponentsEqualityComparer());
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AdminToy"/> class.
         /// </summary>
@@ -33,9 +40,14 @@ internal AdminToy(AdminToyBase toyAdminToyBase, AdminToyType type)
             AdminToyBase = toyAdminToyBase;
             ToyType = type;
 
-            Map.ToysValue.Add(this);
+            BaseToAdminToy.Add(toyAdminToyBase, this);
         }
 
+        /// <summary>
+        /// Gets a list of all <see cref="AdminToy"/>'s on the server.
+        /// </summary>
+        public static IReadOnlyCollection<AdminToy> List => BaseToAdminToy.Values;
+
         /// <summary>
         /// Gets the original <see cref="AdminToys.AdminToyBase"/>.
         /// </summary>
@@ -130,7 +142,22 @@ public bool IsStatic
         /// </summary>
         /// <param name="adminToyBase">The <see cref="AdminToys.AdminToyBase"/> instance.</param>
         /// <returns>The corresponding <see cref="AdminToy"/> instance.</returns>
-        public static AdminToy Get(AdminToyBase adminToyBase) => Map.Toys.FirstOrDefault(x => x.AdminToyBase == adminToyBase);
+        public static AdminToy Get(AdminToyBase adminToyBase)
+        {
+            if (adminToyBase == null)
+                return null;
+
+            if (BaseToAdminToy.TryGetValue(adminToyBase, out AdminToy adminToy))
+                return adminToy;
+
+            return adminToyBase switch
+            {
+                LightSourceToy lightSourceToy => new Light(lightSourceToy),
+                PrimitiveObjectToy primitiveObjectToy => new Primitive(primitiveObjectToy),
+                ShootingTarget shootingTarget => new ShootingTargetToy(shootingTarget),
+                _ => throw new System.NotImplementedException()
+            };
+        }
 
         /// <summary>
         /// Spawns the toy into the game. Use <see cref="UnSpawn"/> to remove it.
@@ -147,7 +174,7 @@ public bool IsStatic
         /// </summary>
         public void Destroy()
         {
-            Map.ToysValue.Remove(this);
+            BaseToAdminToy.Remove(AdminToyBase);
             NetworkServer.Destroy(AdminToyBase.gameObject);
         }
     }

EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs

@@ -27,7 +27,7 @@ public class ChargingJailbirdEventArgs : IPlayerEvent, IItemEvent, IDeniableEven
         public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.ItemBase swingItem, bool isAllowed = true)
         {
             Player = Player.Get(player);
-            Item = Item.Get(swingItem);
+            Jailbird = (Jailbird)Item.Get(swingItem);
 #pragma warning disable CS0618
             IsAllowed = isAllowed;
 #pragma warning restore CS0618
@@ -39,9 +39,14 @@ public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.Item
         public Player Player { get; }
 
         /// <summary>
-        /// Gets the <see cref="API.Features.Items.Item"/> that is being charged. This will always be a <see cref="Jailbird"/>.
+        /// Gets the <see cref="API.Features.Items.Jailbird"/> that is being charged.
         /// </summary>
-        public Item Item { get; }
+        public Jailbird Jailbird { get; }
+
+        /// <summary>
+        /// Gets the <see cref="API.Features.Items.Item"/> that is being charged.
+        /// </summary>
+        public Item Item => Jailbird;
 
         /// <summary>
         /// Gets or sets a value indicating whether or not the Jailbird can be charged.

EXILED/Exiled.Events/EventArgs/Item/SwingingEventArgs.cs

@@ -25,7 +25,7 @@ public class SwingingEventArgs : IPlayerEvent, IItemEvent, IDeniableEvent
         public SwingingEventArgs(ReferenceHub player, InventorySystem.Items.ItemBase swingItem, bool isAllowed = true)
         {
             Player = Player.Get(player);
-            Item = Item.Get(swingItem);
+            Jailbird = (Jailbird)Item.Get(swingItem);
             IsAllowed = isAllowed;
         }
 
@@ -34,10 +34,15 @@ public SwingingEventArgs(ReferenceHub player, InventorySystem.Items.ItemBase swi
         /// </summary>
         public Player Player { get; }
 
+        /// <summary>
+        /// Gets the <see cref="API.Features.Items.Jailbird"/> that is being swung.
+        /// </summary>
+        public Jailbird Jailbird { get; }
+
         /// <summary>
         /// Gets the <see cref="API.Features.Items.Item"/> that is being swung.
         /// </summary>
-        public Item Item { get; }
+        public Item Item => Jailbird;
 
         /// <summary>
         /// Gets or sets a value indicating whether or not the item can be swung.

EXILED/Exiled.Events/EventArgs/Scp079/RecontainedEventArgs.cs

@@ -22,10 +22,16 @@ public class RecontainedEventArgs : IScp079Event
         /// <param name="player">
         /// <inheritdoc cref="Player" />
         /// </param>
-        public RecontainedEventArgs(Player player)
+        /// <param name="scp079Recontainer">
+        /// <inheritdoc cref="Recontainer" />
+        /// </param>
+        public RecontainedEventArgs(Player player, PlayerRoles.PlayableScps.Scp079.Scp079Recontainer scp079Recontainer)
         {
             Player = player;
             Scp079 = player.Role.As<Scp079Role>();
+            Recontainer = scp079Recontainer;
+            Attacker = Player.Get(scp079Recontainer._activatorGlass.LastAttacker);
+            IsAutomatic = scp079Recontainer._activatorGlass.LastAttacker.IsSet;
         }
 
         /// <summary>
@@ -35,5 +41,20 @@ public RecontainedEventArgs(Player player)
 
         /// <inheritdoc/>
         public Scp079Role Scp079 { get; }
+
+        /// <summary>
+        /// Gets the instance that handle SCP-079 recontained proccess.
+        /// </summary>
+        public PlayerRoles.PlayableScps.Scp079.Scp079Recontainer Recontainer { get; }
+
+        /// <summary>
+        /// Gets the player who recontained SCP-079.
+        /// </summary>
+        public Player Attacker { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the recontainment has been made automatically or by triggering the process.
+        /// </summary>
+        public bool IsAutomatic { get; }
     }
-}
+}

EXILED/Exiled.Events/EventArgs/Server/RespawnedTeamEventArgs.cs

@@ -0,0 +1,43 @@
+// -----------------------------------------------------------------------
+// <copyright file="RespawnedTeamEventArgs.cs" company="Exiled Team">
+// Copyright (c) Exiled Team. All rights reserved.
+// Licensed under the CC BY-SA 3.0 license.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Exiled.Events.EventArgs.Server
+{
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using Exiled.API.Features;
+    using Exiled.Events.EventArgs.Interfaces;
+    using Respawning;
+
+    /// <summary>
+    /// Contains all information after team spawns.
+    /// </summary>
+    public class RespawnedTeamEventArgs : IExiledEvent
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RespawnedTeamEventArgs"/> class.
+        /// </summary>
+        /// <param name="hubs"><inheritdoc cref="Players"/></param>
+        /// <param name="team"><inheritdoc cref="Team"/></param>
+        public RespawnedTeamEventArgs(SpawnableTeamType team, IEnumerable<ReferenceHub> hubs)
+        {
+            Players = hubs.Select(Player.Get);
+            Team = team;
+        }
+
+        /// <summary>
+        /// Gets the list of spawned players.
+        /// </summary>
+        public IEnumerable<Player> Players { get; }
+
+        /// <summary>
+        /// Gets the spawned team.
+        /// </summary>
+        public SpawnableTeamType Team { get; }
+    }
+}

EXILED/Exiled.Events/Events.cs

@@ -21,6 +21,7 @@ namespace Exiled.Events
     using PlayerRoles.Ragdolls;
     using PlayerRoles.RoleAssign;
     using PluginAPI.Events;
+    using Respawning;
     using UnityEngine.SceneManagement;
 
     /// <summary>
@@ -70,7 +71,7 @@ public override void OnEnabled()
             Handlers.Map.ChangedIntoGrenade += Handlers.Internal.ExplodingGrenade.OnChangedIntoGrenade;
 
             CharacterClassManager.OnRoundStarted += Handlers.Server.OnRoundStarted;
-
+            RespawnManager.ServerOnRespawned += Handlers.Server.OnRespawnedTeam;
             InventorySystem.InventoryExtensions.OnItemAdded += Handlers.Player.OnItemAdded;
             InventorySystem.InventoryExtensions.OnItemRemoved += Handlers.Player.OnItemRemoved;
 
@@ -105,7 +106,7 @@ public override void OnDisabled()
 
             InventorySystem.InventoryExtensions.OnItemAdded -= Handlers.Player.OnItemAdded;
             InventorySystem.InventoryExtensions.OnItemRemoved -= Handlers.Player.OnItemRemoved;
-
+            RespawnManager.ServerOnRespawned -= Handlers.Server.OnRespawnedTeam;
             RagdollManager.OnRagdollSpawned -= Handlers.Internal.RagdollList.OnSpawnedRagdoll;
             RagdollManager.OnRagdollRemoved -= Handlers.Internal.RagdollList.OnRemovedRagdoll;
             ItemPickupBase.OnPickupAdded -= Handlers.Internal.PickupEvent.OnSpawnedPickup;

EXILED/Exiled.Events/Handlers/Internal/SceneUnloaded.cs

@@ -8,7 +8,7 @@
 namespace Exiled.Events.Handlers.Internal
 {
     using API.Features;
-
+    using Exiled.API.Features.Toys;
     using UnityEngine.SceneManagement;
 
 #pragma warning disable SA1611 // Element parameters should be documented
@@ -35,7 +35,7 @@ public static void OnSceneUnloaded(Scene _)
         {
             Player.UserIdsCache.Clear();
             Player.Dictionary.Clear();
-            Map.ToysValue.Clear();
+            AdminToy.BaseToAdminToy.Clear();
         }
     }
 }