diff --git a/EXILED/Exiled.API/Enums/BloodType.cs b/EXILED/Exiled.API/Enums/BloodType.cs deleted file mode 100644 index 369793e2ad..0000000000 --- a/EXILED/Exiled.API/Enums/BloodType.cs +++ /dev/null @@ -1,40 +0,0 @@ -// ----------------------------------------------------------------------- -// -// Copyright (c) ExMod Team. All rights reserved. -// Licensed under the CC BY-SA 3.0 license. -// -// ----------------------------------------------------------------------- - -namespace Exiled.API.Enums -{ - using System; - - /// - /// Unique identifier for the different types of blood decals. - /// - /// - /// - [Obsolete("This blood decal are outdated now used DecalPoolType.Blood", true)] - public enum BloodType - { - /// - /// The default blood decal. - /// - Default, - - /// - /// The blood decal placed after Scp106 sends someone to the pocket dimension. - /// - Scp106, - - /// - /// The spreaded blood decal. - /// - Spreaded, - - /// - /// The faded blood decal. - /// - Faded, - } -} \ No newline at end of file diff --git a/EXILED/Exiled.API/Enums/CameraType.cs b/EXILED/Exiled.API/Enums/CameraType.cs index eb18b59633..6f2353591e 100644 --- a/EXILED/Exiled.API/Enums/CameraType.cs +++ b/EXILED/Exiled.API/Enums/CameraType.cs @@ -58,11 +58,7 @@ public enum CameraType Hcz106Recontainment, HczChkptEz, HczChkptHcz, - [System.Obsolete("This Camera no longer exist.")] - HczHIDChamber, - [System.Obsolete("This Camera no longer exist.")] - HczHIDHallway, - Hcz939, + Hcz939 = 33, HczArmory, HczArmoryInterior, HczCrossing, @@ -77,11 +73,9 @@ public enum CameraType HczWarheadArmory, HczWarheadControl, HczWarheadHallway, - [System.Obsolete("This Camera no longer exist.")] - HczWarheadTop, #endregion #region Lcz - Lcz173Bottom, + Lcz173Bottom = 49, Lcz173ContChamber, Lcz173Hall, Lcz173Stairs, @@ -122,9 +116,7 @@ public enum CameraType Hcz173Outside, Hcz173Stairs, Hcz173ContChamber, - [System.Obsolete("This Camera no longer exist.")] - Hcz173Hallway, - HczCurve, + HczCurve = 87, HczJunkMain, HczJunkHallway, HczCornerDeep, diff --git a/EXILED/Exiled.API/Enums/DoorType.cs b/EXILED/Exiled.API/Enums/DoorType.cs index 2df0eb8973..932edf8fcb 100644 --- a/EXILED/Exiled.API/Enums/DoorType.cs +++ b/EXILED/Exiled.API/Enums/DoorType.cs @@ -7,8 +7,6 @@ namespace Exiled.API.Enums { - using System; - using Exiled.API.Features.Doors; using Interactables.Interobjects; @@ -165,29 +163,15 @@ public enum DoorType /// HIDChamber, - /// - /// Represents the HID_UPPER door. - /// - [Obsolete("This Door has been renamed too HID_LAB.")] - HIDUpper, - /// /// Represents the HID_LAB door. /// -#pragma warning disable CS0618 - HIDLab = HIDUpper, -#pragma warning restore CS0618 - - /// - /// Represents the HID_LOWER door. - /// - [Obsolete("This Door has been removed from the game.")] - HIDLower, + HIDLab, /// /// Represents the INTERCOM door. /// - Intercom, + Intercom = 31, /// /// Represents the LCZ_ARMORY door. @@ -209,16 +193,10 @@ public enum DoorType /// LightContainmentDoor, - /// - /// Represents the NUKE_ARMORY door. - /// - [Obsolete("This Door has been removed from the game.")] - NukeArmory, - /// /// Represents the NUKE_SURFACE door. /// - NukeSurface, + NukeSurface = 37, /// /// Represents any of the Class-D cell doors. @@ -250,16 +228,10 @@ public enum DoorType /// CheckpointGateB, - /// - /// Represents a door than Yamato never implemented. - /// - [Obsolete("This Door has never been in the game.")] - SurfaceDoor, - /// /// Represents the CHECKPOINT_EZ_HCZ_A door. /// - CheckpointEzHczA, + CheckpointEzHczA = 45, /// /// Represents the CHECKPOINT_EZ_HCZ_B door. diff --git a/EXILED/Exiled.API/Enums/LockerType.cs b/EXILED/Exiled.API/Enums/LockerType.cs index 21dbe9f78f..5d9c70cd20 100644 --- a/EXILED/Exiled.API/Enums/LockerType.cs +++ b/EXILED/Exiled.API/Enums/LockerType.cs @@ -7,18 +7,15 @@ namespace Exiled.API.Enums { - using System; - /// /// Unique identifier for different types of s. /// public enum LockerType { /// - /// The pedestal used by SCP items. + /// Unknown type of locker. /// - [Obsolete("This value is not used.")] - Pedestal, + Unknown, /// /// Large weapon locker. @@ -45,21 +42,10 @@ public enum LockerType /// Adrenaline, - /// - /// Unknown type of locker. - /// - Unknown, - - /// - /// Unknown type of locker. - /// - [Obsolete("Use LockerType.Unknown", true)] - Unknow = Unknown, - /// /// MircoHid pedestal. /// - MicroHid, + MicroHid = 7, /// /// Experimental weapon locker. diff --git a/EXILED/Exiled.API/Enums/PrefabType.cs b/EXILED/Exiled.API/Enums/PrefabType.cs index 2f4dc531cd..54c0c673b9 100644 --- a/EXILED/Exiled.API/Enums/PrefabType.cs +++ b/EXILED/Exiled.API/Enums/PrefabType.cs @@ -102,12 +102,8 @@ public enum PrefabType [Prefab(1925130715, "FirearmPickup")] FirearmPickup, - [Obsolete("This prefab no longer exists")] - [Prefab(1925130715, "Com15Pickup")] - Com15Pickup, - [Prefab(2808038258, "MedkitPickup")] - MedkitPickup, + MedkitPickup = 28, [Prefab(2606539874, "FlashlightPickup")] FlashlightPickup, @@ -124,27 +120,11 @@ public enum PrefabType [Prefab(4056235189, "Ammo12gaPickup")] Ammo12gaPickup, - [Obsolete("This prefab no longer exists")] - [Prefab(212068596, "E11SRPickup")] - E11SRPickup, - - [Obsolete("This prefab no longer exists")] - [Prefab(1982658896, "CrossvecPickup")] - CrossvecPickup, - [Prefab(2474630775, "Ammo556mmPickup")] - Ammo556mmPickup, - - [Obsolete("This prefab no longer exists")] - [Prefab(3462306180, "Fsp9Pickup")] - Fsp9Pickup, - - [Obsolete("This prefab no longer exists")] - [Prefab(2405374689, "LogicerPickup")] - LogicerPickup, + Ammo556mmPickup = 36, [Prefab(1273232029, "HegPickup")] - HegPickup, + HegPickup = 39, [Prefab(3871663704, "FlashbangPickup")] FlashbangPickup, @@ -158,12 +138,8 @@ public enum PrefabType [Prefab(2344368365, "Ammo9mmPickup")] Ammo9mmPickup, - [Obsolete("This prefab no longer exists")] - [Prefab(1749039070, "Com18Pickup")] - Com18Pickup, - [Prefab(3525743409, "Scp018Projectile")] - Scp018Projectile, + Scp018Projectile = 45, [Prefab(3711531185, "SCP268Pickup")] SCP268Pickup, @@ -186,20 +162,8 @@ public enum PrefabType [Prefab(3164421243, "Heavy Armor Pickup")] HeavyArmorPickup, - [Obsolete("This prefab no longer exists")] - [Prefab(1861159387, "RevolverPickup")] - RevolverPickup, - - [Obsolete("This prefab no longer exists")] - [Prefab(3814984482, "AkPickup")] - AkPickup, - - [Obsolete("This prefab no longer exists")] - [Prefab(3180035653, "ShotgunPickup")] - ShotgunPickup, - [Prefab(464602874, "Scp330Pickup")] - Scp330Pickup, + Scp330Pickup = 56, [Prefab(1983050408, "Scp2176Projectile")] Scp2176Projectile, @@ -213,16 +177,8 @@ public enum PrefabType [Prefab(2702950243, "SCP1853Pickup")] SCP1853Pickup, - [Obsolete("This prefab no longer exists")] - [Prefab(3881162440, "DisruptorPickup")] - DisruptorPickup, - - [Obsolete("This prefab no longer exists")] - [Prefab(504857316, "Com45Pickup")] - Com45Pickup, - [Prefab(303271247, "SCP1576Pickup")] - SCP1576Pickup, + SCP1576Pickup = 63, [Prefab(2915316078, "JailbirdPickup")] JailbirdPickup, @@ -230,16 +186,8 @@ public enum PrefabType [Prefab(1209253563, "AntiSCP207Pickup")] AntiSCP207Pickup, - [Obsolete("This prefab no longer exists")] - [Prefab(2216560136, "FRMG0Pickup")] - FRMG0Pickup, - - [Obsolete("This prefab no longer exists")] - [Prefab(74988289, "A7Pickup")] - A7Pickup, - [Prefab(3532394942, "LanternPickup")] - LanternPickup, + LanternPickup = 68, [Prefab(4143962266, "SCP1344Pickup")] Scp1344Pickup, @@ -310,44 +258,20 @@ public enum PrefabType [Prefab(1062458989, "SCP-173 Ragdoll")] Scp173Ragdoll, - [Obsolete("This prefab no longer exists")] - [Prefab(1951328980, "Ragdoll_1")] - Ragdoll1, - [Prefab(992490681, "SCP-106 Ragdoll")] - Scp106Ragdoll, - - [Obsolete("This prefab no longer exists")] - [Prefab(3219675689, "Ragdoll_4")] - Ragdoll4, + Scp106Ragdoll = 93, [Prefab(417388851, "SCP-049 Ragdoll")] - Ragdoll7, - - [Obsolete("This prefab no longer exists")] - [Prefab(3185790062, "Ragdoll_6")] - Ragdoll6, - - [Obsolete("This prefab no longer exists")] - [Prefab(2567420661, "Ragdoll_8")] - Ragdoll8, + Scp049Ragdoll = 95, [Prefab(149379640, "SCP-096 Ragdoll")] - Scp096Ragdoll, + Scp096Ragdoll = 98, [Prefab(1862774274, "Zombie Ragdoll")] - Ragdoll10, - - [Obsolete("This prefab no longer exists")] - [Prefab(2710373253, "Ragdoll_Tut")] - RagdollTutorial, - - [Obsolete("This prefab no longer exists")] - [Prefab(1389252654, "Ragdoll_12")] - Ragdoll12, + Scp049_2Ragdoll, [Prefab(3175759689, "SCP-939 Ragdoll")] - Scp939Ragdoll, + Scp939Ragdoll = 102, [Prefab(3721192489, "SCP-3114 Ragdoll")] Scp3114Ragdoll, diff --git a/EXILED/Exiled.API/Enums/SpawnLocationType.cs b/EXILED/Exiled.API/Enums/SpawnLocationType.cs index 4752396e34..9b1e0cc172 100644 --- a/EXILED/Exiled.API/Enums/SpawnLocationType.cs +++ b/EXILED/Exiled.API/Enums/SpawnLocationType.cs @@ -6,8 +6,6 @@ // ----------------------------------------------------------------------- namespace Exiled.API.Enums { - using System; - /// /// All of the valid spawn location types. /// @@ -78,16 +76,10 @@ public enum SpawnLocationType /// InsideLczCafe, - /// - /// Inside the Nuke armory. - /// - [Obsolete("This Location has been removed from the game.")] - InsideNukeArmory, - /// /// Inside the surface nuke room. /// - InsideSurfaceNuke, + InsideSurfaceNuke = 15, /// /// Inside the first SCP-079 gate. @@ -129,22 +121,10 @@ public enum SpawnLocationType /// InsideHidChamber, - /// - /// Inside the lower door that leads to the stairs in Micro-HID room. - /// - [Obsolete("This location has been removed from the game.")] - InsideHidLower, - - /// - /// Inside the upper door that leads into the Micro-HID room just after the stairs. - /// - [Obsolete("This location has been removed from the game. Use InsideHidLab instead.")] - InsideHidUpper, - /// /// Just inside the LCZ WC door. /// - InsideLczWc, + InsideLczWc = 26, /// /// Inside the Glass Box in GR-18. diff --git a/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs b/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs index 071cbb5611..d263284756 100644 --- a/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs +++ b/EXILED/Exiled.API/Extensions/BitwiseExtensions.cs @@ -59,16 +59,5 @@ public static T ModifyFlags(this T flags, bool value, params T[] changeFlags) return (T)Enum.ToObject(typeof(T), currentValue); } - - /// - /// Checks if flag has specified value. - /// - /// Flag to check. - /// Value to check in flag. - /// The type of the enum. - /// if value is presented in flag. Otherwise, . - [Obsolete("Use Enum::HasFlag instead.")] - public static bool HasFlagFast(this T flag, T value) - where T : Enum => flag.HasFlag(value); } } \ No newline at end of file diff --git a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs index bbd3258782..814d48b180 100644 --- a/EXILED/Exiled.API/Extensions/MirrorExtensions.cs +++ b/EXILED/Exiled.API/Extensions/MirrorExtensions.cs @@ -206,18 +206,6 @@ public static ReadOnlyDictionary RpcFullNames /// Setting info. public static void SetPlayerInfoForTargetOnly(this Player player, Player target, string info) => player.SendFakeSyncVar(target.ReferenceHub.networkIdentity, typeof(NicknameSync), nameof(NicknameSync.Network_customPlayerInfoString), info); - /// - /// Plays a gun sound that only the can hear. - /// - /// Target to play. - /// Position to play on. - /// Weapon' sound to play. - /// Sound's volume to set. - /// GunAudioMessage's audioClipId to set (default = 0). - [Obsolete("This method is not working. Use PlayGunSound(Player, Vector3, FirearmType, float, int, bool) overload instead.")] - public static void PlayGunSound(this Player player, Vector3 position, ItemType itemType, byte volume, byte audioClipId = 0) - => PlayGunSound(player, position, itemType.GetFirearmType(), volume, audioClipId); - /// /// Plays a gun sound that only the can hear. /// diff --git a/EXILED/Exiled.API/Features/Cassie.cs b/EXILED/Exiled.API/Features/Cassie.cs index e14c4c7288..38d0356df9 100644 --- a/EXILED/Exiled.API/Features/Cassie.cs +++ b/EXILED/Exiled.API/Features/Cassie.cs @@ -97,16 +97,6 @@ public static void DelayedMessage(string message, float delay, bool isHeld = fal public static void DelayedGlitchyMessage(string message, float delay, float glitchChance, float jamChance) => Timing.CallDelayed(delay, () => new CassieAnnouncement(new CassieTtsPayload(CassieGlitchifier.Glitchify(message, glitchChance, jamChance), true, true), 0f, 0f).AddToQueue()); - /// - /// Calculates the duration of a C.A.S.S.I.E message. - /// - /// The message, which duration will be calculated. - /// An obsolete parameter. - /// Another obsolete parameter. - /// Duration (in seconds) of specified message. - [Obsolete("Please use CalculateDuration(string)", true)] - public static float CalculateDuration(string message, bool obsolete1, float obsolete2) => CalculateDuration(message); - /// /// Calculates the duration of a C.A.S.S.I.E message. /// @@ -192,21 +182,6 @@ public static string ConvertNumber(int num) public static void ScpTermination(Player scp, DamageHandlerBase info) => CassieScpTerminationAnnouncement.AnnounceScpTermination(scp.ReferenceHub, info); - /// - /// Announces the termination of a custom SCP Number. - /// - /// SCP Number. Note that for larger numbers, C.A.S.S.I.E will pronounce the place (eg. "457" -> "four hundred fifty seven"). Spaces can be used to prevent this behavior. - /// Hit Information. - [Obsolete("Use this instead CustomScpTermination(string, CustomHandler)")] - public static void CustomScpTermination(string scpNumber, DamageHandlers.DamageHandlerBase info) - { - if (scpNumber.StartsWith("SCP", StringComparison.InvariantCultureIgnoreCase)) - scpNumber = scpNumber.Remove(0, 3); - - if (info is CustomHandler customHandler) - CustomScpTermination(scpNumber, customHandler); - } - /// /// Announces the termination of a custom SCP Number. /// diff --git a/EXILED/Exiled.API/Features/Core/UserSettings/DropdownSetting.cs b/EXILED/Exiled.API/Features/Core/UserSettings/DropdownSetting.cs index 8876f74b96..8afd1439c8 100644 --- a/EXILED/Exiled.API/Features/Core/UserSettings/DropdownSetting.cs +++ b/EXILED/Exiled.API/Features/Core/UserSettings/DropdownSetting.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) ExMod Team. All rights reserved. // Licensed under the CC BY-SA 3.0 license. @@ -20,32 +20,6 @@ namespace Exiled.API.Features.Core.UserSettings /// public class DropdownSetting : SettingBase, IWrapper { - /// - /// Initializes a new instance of the class. - /// - /// - /// - /// - /// - /// - /// - /// - /// - [Obsolete("Will be removed in Exiled 10 in favour of ctor with more params")] - public DropdownSetting( - int id, - string label, - IEnumerable options, - int defaultOptionIndex, - SSDropdownSetting.DropdownEntryType dropdownEntryType, - string hintDescription, - HeaderSetting header, - Action onChanged) - : base(new SSDropdownSetting(id, label, options.ToArray(), defaultOptionIndex, dropdownEntryType, hintDescription), header, onChanged) - { - Base = (SSDropdownSetting)base.Base; - } - /// /// Initializes a new instance of the class. /// diff --git a/EXILED/Exiled.API/Features/Core/UserSettings/HeaderSetting.cs b/EXILED/Exiled.API/Features/Core/UserSettings/HeaderSetting.cs index 5944a682fd..7635dece18 100644 --- a/EXILED/Exiled.API/Features/Core/UserSettings/HeaderSetting.cs +++ b/EXILED/Exiled.API/Features/Core/UserSettings/HeaderSetting.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) ExMod Team. All rights reserved. // Licensed under the CC BY-SA 3.0 license. @@ -7,8 +7,6 @@ namespace Exiled.API.Features.Core.UserSettings { - using System; - using Exiled.API.Interfaces; using global::UserSettings.ServerSpecific; @@ -18,21 +16,6 @@ namespace Exiled.API.Features.Core.UserSettings /// public class HeaderSetting : SettingBase, IWrapper { - /// - /// Initializes a new instance of the class. - /// - /// - /// - /// - [Obsolete("Use constructor with Id, old headers will use random number based on headers name")] - public HeaderSetting(string name, string hintDescription, bool paddling) - : this(new SSGroupHeader(name, paddling, hintDescription)) - { - Base = (SSGroupHeader)base.Base; - - Base.SetId(null, name); - } - /// /// Initializes a new instance of the class. /// diff --git a/EXILED/Exiled.API/Features/Core/UserSettings/KeybindSetting.cs b/EXILED/Exiled.API/Features/Core/UserSettings/KeybindSetting.cs index 98c168adaa..117cf214d2 100644 --- a/EXILED/Exiled.API/Features/Core/UserSettings/KeybindSetting.cs +++ b/EXILED/Exiled.API/Features/Core/UserSettings/KeybindSetting.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) ExMod Team. All rights reserved. // Licensed under the CC BY-SA 3.0 license. @@ -20,41 +20,6 @@ namespace Exiled.API.Features.Core.UserSettings /// public class KeybindSetting : SettingBase, IWrapper { - /// - /// Initializes a new instance of the class. - /// - /// - /// - /// - /// - /// - /// - /// - [Obsolete("This method will be removed next major version because of a new feature. Use the constructor with \"CollectionId\" instead.")] - public KeybindSetting(int id, string label, KeyCode suggested, bool preventInteractionOnGUI, string hintDescription, HeaderSetting header, Action onChanged) - : base(new SSKeybindSetting(id, label, suggested, preventInteractionOnGUI, false, hintDescription), header, onChanged) - { - Base = (SSKeybindSetting)base.Base; - } - - /// - /// Initializes a new instance of the class. - /// - /// - /// - /// - /// - /// - /// - /// - /// - [Obsolete("Will be removed in Exiled 10 in favour of ctor with more params.")] - public KeybindSetting(int id, string label, KeyCode suggested, bool preventInteractionOnGUI, bool allowSpectatorTrigger, string hintDescription, HeaderSetting header, Action onChanged) - : base(new SSKeybindSetting(id, label, suggested, preventInteractionOnGUI, allowSpectatorTrigger, hintDescription), header, onChanged) - { - Base = (SSKeybindSetting)base.Base; - } - /// /// Initializes a new instance of the class. /// diff --git a/EXILED/Exiled.API/Features/Core/UserSettings/SliderSetting.cs b/EXILED/Exiled.API/Features/Core/UserSettings/SliderSetting.cs index 3a88ab477c..e67538d54e 100644 --- a/EXILED/Exiled.API/Features/Core/UserSettings/SliderSetting.cs +++ b/EXILED/Exiled.API/Features/Core/UserSettings/SliderSetting.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) ExMod Team. All rights reserved. // Licensed under the CC BY-SA 3.0 license. @@ -18,25 +18,6 @@ namespace Exiled.API.Features.Core.UserSettings /// public class SliderSetting : SettingBase, IWrapper { - /// - /// Initializes a new instance of the class. - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - [Obsolete("Will be removed in Exiled 10 in favour of ctor with more params.")] - public SliderSetting(int id, string label, float minValue, float maxValue, float defaultValue, bool isInteger, string stringFormat, string displayFormat, string hintDescription) - : this(new SSSliderSetting(id, label, minValue, maxValue, defaultValue, isInteger, stringFormat, displayFormat, hintDescription)) - { - Base = (SSSliderSetting)base.Base; - } - /// /// Initializes a new instance of the class. /// diff --git a/EXILED/Exiled.API/Features/Core/UserSettings/TwoButtonsSetting.cs b/EXILED/Exiled.API/Features/Core/UserSettings/TwoButtonsSetting.cs index d921ede5a4..4df8e471ff 100644 --- a/EXILED/Exiled.API/Features/Core/UserSettings/TwoButtonsSetting.cs +++ b/EXILED/Exiled.API/Features/Core/UserSettings/TwoButtonsSetting.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) ExMod Team. All rights reserved. // Licensed under the CC BY-SA 3.0 license. @@ -18,24 +18,6 @@ namespace Exiled.API.Features.Core.UserSettings /// public class TwoButtonsSetting : SettingBase, IWrapper { - /// - /// Initializes a new instance of the class. - /// - /// - /// - /// - /// - /// - /// - /// - /// - [Obsolete("Will be removed in Exiled 10 in favour of ctor with more params.")] - public TwoButtonsSetting(int id, string label, string firstOption, string secondOption, bool defaultIsSecond, string hintDescription, HeaderSetting header, Action onChanged) - : base(new SSTwoButtonsSetting(id, label, firstOption, secondOption, defaultIsSecond, hintDescription), header, onChanged) - { - Base = (SSTwoButtonsSetting)base.Base; - } - /// /// Initializes a new instance of the class. /// diff --git a/EXILED/Exiled.API/Features/Core/UserSettings/UserTextInputSetting.cs b/EXILED/Exiled.API/Features/Core/UserSettings/UserTextInputSetting.cs index fe773e8021..061c5edec8 100644 --- a/EXILED/Exiled.API/Features/Core/UserSettings/UserTextInputSetting.cs +++ b/EXILED/Exiled.API/Features/Core/UserSettings/UserTextInputSetting.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) ExMod Team. All rights reserved. // Licensed under the CC BY-SA 3.0 license. @@ -20,22 +20,6 @@ namespace Exiled.API.Features.Core.UserSettings /// public class UserTextInputSetting : SettingBase, IWrapper { - /// - /// Initializes a new instance of the class. - /// - /// - /// - /// - /// - /// - /// - [Obsolete("Will be removed in Exiled 10 in favour of ctor with more params.")] - public UserTextInputSetting(int id, string label, string placeHolder, int characterLimit, TMP_InputField.ContentType contentType, string hintDescription) - : this(new SSPlaintextSetting(id, label, placeHolder, characterLimit, contentType, hintDescription)) - { - Base = (SSPlaintextSetting)base.Base; - } - /// /// Initializes a new instance of the class. /// diff --git a/EXILED/Exiled.API/Features/DamageHandlers/GenericDamageHandler.cs b/EXILED/Exiled.API/Features/DamageHandlers/GenericDamageHandler.cs index 776aa1943f..bf3d9db499 100644 --- a/EXILED/Exiled.API/Features/DamageHandlers/GenericDamageHandler.cs +++ b/EXILED/Exiled.API/Features/DamageHandlers/GenericDamageHandler.cs @@ -7,8 +7,6 @@ namespace Exiled.API.Features.DamageHandlers { - using System; - using Enums; using Exiled.API.Extensions; @@ -247,22 +245,6 @@ public GenericDamageHandler(Player player, Player attacker, float damage, Damage } } - /// - /// Initializes a new instance of the class. - /// Transform input data to custom generic handler. - /// - /// Current player (Target). - /// Attacker. - /// Damage quantity. - /// Damage type. - /// Custom cassie announcment. - /// Text to provide to player death screen. - [Obsolete("This constructor will be deleted in Exiled 10")] - public GenericDamageHandler(Player player, Player attacker, float damage, DamageType damageType, DamageHandlerBase.CassieAnnouncement cassieAnnouncement, string damageText) - : this(player, attacker, damage, damageType, cassieAnnouncement, damageText, false) - { - } - /// /// Gets or sets a custom base. /// diff --git a/EXILED/Exiled.API/Features/Items/Armor.cs b/EXILED/Exiled.API/Features/Items/Armor.cs index 43676a2e97..b3c2d49c9a 100644 --- a/EXILED/Exiled.API/Features/Items/Armor.cs +++ b/EXILED/Exiled.API/Features/Items/Armor.cs @@ -7,7 +7,6 @@ namespace Exiled.API.Features.Items { - using System; using System.Collections.Generic; using System.Linq; @@ -64,16 +63,6 @@ internal Armor(ItemType type) /// public bool IsWorn => Base.IsWorn; - /// - /// Gets or sets a value indicating whether excess ammo should be removed when the armor is dropped. - /// - [Obsolete("Not functional anymore", true)] - public bool RemoveExcessOnDrop - { - get => false; - set => _ = value; - } - /// /// Gets or sets the Weight of the armor. /// diff --git a/EXILED/Exiled.API/Features/Lift.cs b/EXILED/Exiled.API/Features/Lift.cs index 8e47b7ba04..4439d6b3b1 100644 --- a/EXILED/Exiled.API/Features/Lift.cs +++ b/EXILED/Exiled.API/Features/Lift.cs @@ -135,12 +135,6 @@ public ElevatorSequence Status set => Base.CurSequence = value; } - /// - /// Gets the representing the space inside the lift. - /// - [Obsolete("It's now necessary to use RelativeBounds instead", true)] - public Bounds Bounds => Base.WorldspaceBounds.Bounds; - /// /// Gets the representing the space inside the lift. /// diff --git a/EXILED/Exiled.API/Features/Map.cs b/EXILED/Exiled.API/Features/Map.cs index 5f32057557..064917ad32 100644 --- a/EXILED/Exiled.API/Features/Map.cs +++ b/EXILED/Exiled.API/Features/Map.cs @@ -435,14 +435,6 @@ public static void CleanAllRagdolls(IEnumerable ragDolls) /// Decal type to destroy. public static void Clean(DecalPoolType decalType) => Clean(decalType, int.MaxValue); - /// - /// Places a blood decal. - /// - /// The position of the blood decal. - /// The direction of the blood decal. - [Obsolete("Use PlaceBlood(this Player, Vector3, Vector3, RoleTypeId, int) instead.")] - public static void PlaceBlood(Vector3 position, Vector3 direction) => _ = 0; - /// /// Gets all the near cameras. /// @@ -493,18 +485,6 @@ public static void ExplodeEffect(Vector3 position, ProjectileType projectileType ExplosionUtils.ServerSpawnEffect(position, item); } - /// - /// Plays a gun sound at the specified position. - /// - /// Position to play the sound at. - /// The type of firearm to play the sound of. - /// The maximum distance the sound can be heard from. - /// The audio clip ID to play. - [Obsolete("This method is not working. Use PlayGunSound(Player, Vector3, FirearmType, float, int, bool) overload instead.")] - public static void PlayGunSound(Vector3 position, ItemType firearmType, byte maxDistance = 45, byte audioClipId = 0) - { - } - /// /// Spawns mice inside the . /// diff --git a/EXILED/Exiled.API/Features/Pickups/BodyArmorPickup.cs b/EXILED/Exiled.API/Features/Pickups/BodyArmorPickup.cs index aef81f1c79..737b7db2aa 100644 --- a/EXILED/Exiled.API/Features/Pickups/BodyArmorPickup.cs +++ b/EXILED/Exiled.API/Features/Pickups/BodyArmorPickup.cs @@ -7,7 +7,6 @@ namespace Exiled.API.Features.Pickups { - using System; using System.Collections.Generic; using System.Linq; @@ -65,12 +64,6 @@ internal BodyArmorPickup(ItemType type) /// public bool IsWorn { get; } = true; - /// - /// Gets or sets a value indicating whether excess ammo should be removed when the armor is dropped. - /// - [Obsolete("Propetry is internal, and controls armor remove logic for clearing inventory")] - public bool RemoveExcessOnDrop { get; set; } - /// /// Gets or sets how strong the helmet on the armor is. /// diff --git a/EXILED/Exiled.API/Features/Pickups/FirearmPickup.cs b/EXILED/Exiled.API/Features/Pickups/FirearmPickup.cs index a527603e33..2052002692 100644 --- a/EXILED/Exiled.API/Features/Pickups/FirearmPickup.cs +++ b/EXILED/Exiled.API/Features/Pickups/FirearmPickup.cs @@ -7,8 +7,6 @@ namespace Exiled.API.Features.Pickups { - using System; - using Exiled.API.Interfaces; using InventorySystem.Items; @@ -49,12 +47,6 @@ internal FirearmPickup(ItemType type) /// public new BaseFirearm Base { get; } - /// - /// Gets a value indicating whether the pickup is already distributed. - /// - [Obsolete("Feature deprecated")] - public bool IsDistributed { get; } - /// /// Gets or sets a value indicating how much ammo can contain this . /// diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 936a82c4c6..1450f24220 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -480,8 +480,6 @@ public bool IsOverwatchEnabled /// /// Gets or sets a value indicating whether the player is allowed to enter noclip mode. /// - /// For forcing the player into noclip mode, see . - /// public bool IsNoclipPermitted { get => FpcNoclip.IsPermitted(ReferenceHub); @@ -1058,12 +1056,6 @@ public float HumeShieldRegenerationMultiplier /// public IEnumerable ActiveArtificialHealthProcesses => ReferenceHub.playerStats.GetModule()._activeProcesses; - /// - /// Gets the player's . - /// - [Obsolete("Use " + nameof(CustomHumeShieldStat) + " instead.")] - public HumeShieldStat HumeShieldStat => CustomHumeShieldStat; - /// /// Gets or sets the item in the player's hand. Value will be if the player is not holding anything. /// @@ -3855,19 +3847,10 @@ public void Reconnect(ushort newPort = 0, float delay = 5, bool reconnect = true Connection.Send(new RoundRestartMessage(roundRestartType, delay, newPort, reconnect, false)); } - /// - [Obsolete("Use PlayGunSound(Player, Vector3, FirearmType, byte, byte) instead.")] - public void PlayGunSound(ItemType type, byte volume, byte audioClipId = 0) - => PlayGunSound(type.GetFirearmType(), volume, audioClipId); - /// public void PlayGunSound(FirearmType itemType, float pitch = 1, int clipIndex = 0) => this.PlayGunSound(Position, itemType, pitch, clipIndex); - /// - [Obsolete("Use PlaceBlood(this Player, Vector3, Vector3, RoleTypeId, int) instead.")] - public void PlaceBlood(Vector3 direction) => Map.PlaceBlood(Position, direction); - /// public IEnumerable GetNearCameras(float toleration = 15f) => Map.GetNearCameras(Position, toleration); diff --git a/EXILED/Exiled.API/Features/PrefabHelper.cs b/EXILED/Exiled.API/Features/PrefabHelper.cs index e89fd36cee..bcbba8eec2 100644 --- a/EXILED/Exiled.API/Features/PrefabHelper.cs +++ b/EXILED/Exiled.API/Features/PrefabHelper.cs @@ -56,9 +56,7 @@ public static class PrefabHelper /// Returns the . public static GameObject GetPrefab(PrefabType prefabType) { -#pragma warning disable CS0618 // Type or member is obsolete if (prefabType is PrefabType.HCZOneSided or PrefabType.HCZTwoSided) -#pragma warning restore CS0618 // Type or member is obsolete { prefabType = PrefabType.HCZBreakableDoor; } @@ -118,7 +116,6 @@ public static GameObject Spawn(PrefabType prefabType, Vector3 position = default positionSync.Network_rotationY = (sbyte)Mathf.RoundToInt(rotation.Value.eulerAngles.y / 5.625F); } -#pragma warning disable CS0618 // Type or member is obsolete if (prefabType is PrefabType.HCZOneSided or PrefabType.HCZTwoSided or PrefabType.HCZBreakableDoor) { newGameObject.GetComponent().Network_syncBitmask = prefabType switch @@ -129,7 +126,6 @@ public static GameObject Spawn(PrefabType prefabType, Vector3 position = default _ => 0, }; } -#pragma warning restore CS0618 // Type or member is obsolete NetworkServer.Spawn(newGameObject); diff --git a/EXILED/Exiled.API/Features/Recontainer.cs b/EXILED/Exiled.API/Features/Recontainer.cs index 4b17861038..af95173e45 100644 --- a/EXILED/Exiled.API/Features/Recontainer.cs +++ b/EXILED/Exiled.API/Features/Recontainer.cs @@ -34,12 +34,6 @@ public static class Recontainer /// public static IEnumerable ContainmentGates => Door.Get(door => Base._containmentGates.Contains(door.Base)); - /// - /// Gets a value indicating whether the C.A.S.S.I.E is currently busy. - /// - [Obsolete("Use Cassie.IsSpeaking instead")] - public static bool IsCassieBusy => Cassie.IsSpeaking; - /// /// Gets a value about how many generator have been activated. /// @@ -63,12 +57,6 @@ public static bool IsContainmentZoneLocked set => Base.SetContainmentDoors(IsContainmentZoneOpen, value); } - /// - /// Gets or sets the delay to wait before overcharging. - /// - [Obsolete("Will be removed in Exiled 10, patch the Cassie079RecontainAnnouncement ctor if you need this functionality")] - public static float OverchargeDelay { get; set; } - /// /// Gets or sets the lockdown duration. /// diff --git a/EXILED/Exiled.API/Features/Respawn.cs b/EXILED/Exiled.API/Features/Respawn.cs index aeebe336f6..4a12a8ea40 100644 --- a/EXILED/Exiled.API/Features/Respawn.cs +++ b/EXILED/Exiled.API/Features/Respawn.cs @@ -30,12 +30,6 @@ namespace Exiled.API.Features /// public static class Respawn { - /// - /// Gets the of paused 's. - /// - [Obsolete("This is now unused.", true)] - public static List PausedWaves { get; } = new(); - /// /// Gets the containing faction influence. /// diff --git a/EXILED/Exiled.API/Features/Roles/FpcRole.cs b/EXILED/Exiled.API/Features/Roles/FpcRole.cs index 17294f5236..111662604d 100644 --- a/EXILED/Exiled.API/Features/Roles/FpcRole.cs +++ b/EXILED/Exiled.API/Features/Roles/FpcRole.cs @@ -7,7 +7,6 @@ namespace Exiled.API.Features.Roles { - using System; using System.Collections.Generic; using Exiled.API.Features.Pools; @@ -20,8 +19,6 @@ namespace Exiled.API.Features.Roles using PlayerRoles.Visibility; using PlayerRoles.Voice; - using PlayerStatsSystem; - using RelativePositioning; using UnityEngine; @@ -266,19 +263,6 @@ public PlayerMovementState MoveState /// public bool IsHumeShieldedRole => this is IHumeShieldRole; - /// - /// Gets or sets a value indicating whether the player has noclip enabled. - /// - /// indicating status. - /// For permitting a player to enter and exit noclip freely, see . - /// - [Obsolete("Use Player::IsNoclipEnabled instead")] - public bool IsNoclipEnabled - { - get => Owner.ReferenceHub.playerStats.GetModule().HasFlag(AdminFlags.Noclip); - set => Owner.ReferenceHub.playerStats.GetModule().SetFlag(AdminFlags.Noclip, value); - } - /// /// Gets or sets a prefab ragdoll for this role. /// diff --git a/EXILED/Exiled.API/Features/Scp559.cs b/EXILED/Exiled.API/Features/Scp559.cs index 4cfc434eda..e680467736 100644 --- a/EXILED/Exiled.API/Features/Scp559.cs +++ b/EXILED/Exiled.API/Features/Scp559.cs @@ -71,17 +71,6 @@ public Scp559(Scp559Cake cakeBase) return new Vector4(t.position.x, t.position.y, t.position.z, t.eulerAngles.y); }).ToList(); - /// - /// Gets or sets offset for spawning near pedestals. - /// - public static Vector3 PedestalOffset - { - get => new(0, -Scp559Spawnpoint.PedestalHeight, 0); - - [Obsolete("Setter no longer works")] - set { } - } - /// public Scp559Cake Base { get; } diff --git a/EXILED/Exiled.API/Features/Server.cs b/EXILED/Exiled.API/Features/Server.cs index fd90b8d14c..69aacef723 100644 --- a/EXILED/Exiled.API/Features/Server.cs +++ b/EXILED/Exiled.API/Features/Server.cs @@ -184,19 +184,6 @@ public static int MaxPlayerCount /// public static float LateJoinTime => ConfigFile.ServerConfig.GetFloat(RoleAssigner.LateJoinKey, 0f); - /// - /// Gets or sets a value indicating whether the server is marked as Heavily Modded. - /// - /// Read the VSR for more info about its usage. - /// - /// - [Obsolete("This field has been deleted because it used the wrong field (TransparentlyModded)")] - public static bool IsHeavilyModded - { - get => false; - set => _ = value; - } - /// /// Gets or sets a value indicating whether the server is marked as Transparently Modded. /// diff --git a/EXILED/Exiled.API/Features/Toys/Light.cs b/EXILED/Exiled.API/Features/Toys/Light.cs index e65387ba3e..6225ad3d74 100644 --- a/EXILED/Exiled.API/Features/Toys/Light.cs +++ b/EXILED/Exiled.API/Features/Toys/Light.cs @@ -7,7 +7,6 @@ namespace Exiled.API.Features.Toys { - using System; using System.Linq; using AdminToys; @@ -99,16 +98,6 @@ public Color Color set => Base.NetworkLightColor = value; } - /// - /// Gets or sets the shape that the Light emits. - /// - [Obsolete("This property has been deprecated. Use LightType.Spot, LightType.Pyramid, or LightType.Box instead.")] - public LightShape LightShape - { - get => Base.NetworkLightShape; - set => Base.NetworkLightShape = value; - } - /// /// Gets or sets the type of light the Light emits. /// diff --git a/EXILED/Exiled.API/Features/Window.cs b/EXILED/Exiled.API/Features/Window.cs index a1f92bc26f..1a2e48cea7 100644 --- a/EXILED/Exiled.API/Features/Window.cs +++ b/EXILED/Exiled.API/Features/Window.cs @@ -132,16 +132,6 @@ public bool DisableScpDamage set => Base._preventScpDamage = value; } - /// - /// Gets or sets a value indicating whether this window is broken. - /// - [Obsolete("You should use IsBroken Propperty now", true)] - public bool SyncStatus - { - get => Base._prevStatus; - set => Base._prevStatus = value; - } - /// /// Gets or sets a value indicating who is the LastAttacker. /// diff --git a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs index 2b7356c0b6..7da70ca0f7 100644 --- a/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs +++ b/EXILED/Exiled.CustomItems/API/Features/CustomItem.cs @@ -863,15 +863,6 @@ protected virtual void OnDroppingItem(DroppingItemEventArgs ev) { } - /// - /// Handles tracking items when they are dropped by a player. - /// - /// . - [Obsolete("Use OnDroppingItem instead.", false)] - protected virtual void OnDropping(DroppingItemEventArgs ev) - { - } - /// /// Handles tracking when player requests drop of item which equals to the specified by . /// @@ -1034,11 +1025,6 @@ private void OnInternalDroppingItem(DroppingItemEventArgs ev) return; OnDroppingItem(ev); - - // TODO: Don't forget to remove this with next update -#pragma warning disable CS0618 - OnDropping(ev); -#pragma warning restore CS0618 } private void OnInternalDroppingAmmo(DroppingAmmoEventArgs ev) diff --git a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs index c7c2c633df..ee3ac4e23a 100644 --- a/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Cassie/SendingCassieMessageEventArgs.cs @@ -123,12 +123,6 @@ public float GlitchScale /// public bool IsAllowed { get; set; } - /// - /// Gets or sets a value indicating whether the event can be executed. - /// - [Obsolete("Useless and will be removed in Exiled 10.")] - public bool IsCustomAnnouncement { get; set; } - /// /// Gets or sets a value indicating where the subtitles for this message came from. /// diff --git a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs index b693cfc0b9..25de8f6deb 100644 --- a/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Map/AnnouncingScpTerminationEventArgs.cs @@ -7,10 +7,7 @@ namespace Exiled.Events.EventArgs.Map { - using System; - using Exiled.API.Features; - using Exiled.API.Features.DamageHandlers; using Exiled.API.Features.Roles; using Interfaces; @@ -18,7 +15,7 @@ namespace Exiled.Events.EventArgs.Map /// /// Contains all information before C.A.S.S.I.E announces an SCP termination. /// - public class AnnouncingScpTerminationEventArgs : IAttackerEvent, IDeniableEvent + public class AnnouncingScpTerminationEventArgs : IDeniableEvent { /// /// Initializes a new instance of the class. @@ -52,18 +49,6 @@ public AnnouncingScpTerminationEventArgs(Player scp, string terminationCause) /// public Player Player { get; } - /// - /// Gets the player who killed the SCP. - /// - [Obsolete("Attacker can no longer be acquired for this event. This will be readded in a different event.")] - public Player Attacker { get; } - - /// - /// Gets or sets the . - /// - [Obsolete("DamageHandler can no longer be acquired for this event. This will be readded in a different event.")] - public CustomDamageHandler DamageHandler { get; set; } - /// /// Gets or sets a value indicating whether the SCP termination will be announced by C.A.S.S.I.E. /// diff --git a/EXILED/Exiled.Events/EventArgs/Player/SpawningEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Player/SpawningEventArgs.cs index 73413e42c1..50f2accc9f 100644 --- a/EXILED/Exiled.Events/EventArgs/Player/SpawningEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Player/SpawningEventArgs.cs @@ -7,8 +7,6 @@ namespace Exiled.Events.EventArgs.Player { - using System; - using Exiled.API.Features; using Exiled.API.Features.Roles; using Exiled.Events.EventArgs.Interfaces; @@ -66,12 +64,6 @@ public SpawningEventArgs(Player player, Vector3 position, float rotation, Player /// public float HorizontalRotation { get; set; } - /// - /// Gets the player's old role. - /// - [Obsolete("Removed because the method is no longer provide OldRole since version 14.0. Use Player.Role instead")] - public Role OldRole => Player.Role; - /// /// Gets the player's new role. /// diff --git a/EXILED/Exiled.Events/EventArgs/Scp1344/ChangedStatusEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp1344/ChangedStatusEventArgs.cs index 7c8c6b287e..12d7faf38f 100644 --- a/EXILED/Exiled.Events/EventArgs/Scp1344/ChangedStatusEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Scp1344/ChangedStatusEventArgs.cs @@ -7,8 +7,6 @@ namespace Exiled.Events.EventArgs.Scp1344 { - using System; - using Exiled.API.Features.Items; using Exiled.Events.EventArgs.Interfaces; @@ -18,7 +16,7 @@ namespace Exiled.Events.EventArgs.Scp1344 /// /// Contains all information after SCP-1344 status changing. /// - public class ChangedStatusEventArgs : IScp1344Event, IPlayerEvent, IDeniableEvent + public class ChangedStatusEventArgs : IScp1344Event, IPlayerEvent { /// /// Initializes a new instance of the class. @@ -51,9 +49,5 @@ public ChangedStatusEventArgs(ItemBase item, Scp1344Status scp1344Status) /// Gets Scp1344 item. /// public Scp1344 Scp1344 { get; } - - /// - [Obsolete("Please use ChangingStatusEventArgs::IsAllowed instead of this", true)] - public bool IsAllowed { get; set; } } } \ No newline at end of file diff --git a/EXILED/Exiled.Events/EventArgs/Scp173/PlacingTantrumEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Scp173/PlacingTantrumEventArgs.cs index 6b651d01a4..22006fbaf0 100644 --- a/EXILED/Exiled.Events/EventArgs/Scp173/PlacingTantrumEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Scp173/PlacingTantrumEventArgs.cs @@ -7,13 +7,9 @@ namespace Exiled.Events.EventArgs.Scp173 { - using System; - using Exiled.API.Features; using Exiled.Events.EventArgs.Interfaces; - using Hazards; - using PlayerRoles.Subroutines; using Scp173Role = API.Features.Roles.Scp173Role; @@ -29,22 +25,16 @@ public class PlacingTantrumEventArgs : IScp173Event, IDeniableEvent /// /// /// - /// - /// - /// /// /// /// /// /// /// - public PlacingTantrumEventArgs(Player player, TantrumEnvironmentalHazard tantrumHazard, AbilityCooldown cooldown, bool isAllowed = true) + public PlacingTantrumEventArgs(Player player, AbilityCooldown cooldown, bool isAllowed = true) { Player = player; Scp173 = Player.Role.As(); -#pragma warning disable CS0618 - TantrumHazard = tantrumHazard; -#pragma warning restore CS0618 Cooldown = cooldown; IsAllowed = isAllowed; } @@ -54,12 +44,6 @@ public PlacingTantrumEventArgs(Player player, TantrumEnvironmentalHazard tantrum /// public Scp173Role Scp173 { get; } - /// - /// Gets the . - /// - [Obsolete("This propperty is always null")] - public TantrumEnvironmentalHazard TantrumHazard { get; } - /// /// Gets the tantrum . /// diff --git a/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs index c919f8ac1b..b4708047c6 100644 --- a/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs +++ b/EXILED/Exiled.Events/EventArgs/Server/EndingRoundEventArgs.cs @@ -7,8 +7,6 @@ namespace Exiled.Events.EventArgs.Server { - using System; - using Exiled.API.Enums; using Interfaces; @@ -47,16 +45,6 @@ public EndingRoundEventArgs(LeadingTeam leadingTeam, RoundSummary.SumInfo_ClassL /// public LeadingTeam LeadingTeam { get; set; } - /// - /// Gets or sets a value indicating whether the round is ended by API call. - /// - [Obsolete("This event is now call only when it's haven't been force eneded")] - public bool IsForceEnded - { - get => false; // This event is now call only when ForceEnd method haven't been called - set => IsAllowed = value; - } - /// /// Gets or sets a value indicating whether the round is going to finish or not. /// diff --git a/EXILED/Exiled.Events/Patches/Events/Scp173/PlacingTantrum.cs b/EXILED/Exiled.Events/Patches/Events/Scp173/PlacingTantrum.cs index 62359a7c27..96e0718904 100644 --- a/EXILED/Exiled.Events/Patches/Events/Scp173/PlacingTantrum.cs +++ b/EXILED/Exiled.Events/Patches/Events/Scp173/PlacingTantrum.cs @@ -51,9 +51,6 @@ private static IEnumerable Transpiler(IEnumerable), nameof(StandardSubroutine.Owner))), new(OpCodes.Call, Method(typeof(API.Features.Player), nameof(API.Features.Player.Get), new[] { typeof(ReferenceHub) })), - // tantrumEnvironmentalHazard - new(OpCodes.Ldloc_1), - // this.Cooldown new(OpCodes.Ldarg_0), new(OpCodes.Ldfld, Field(typeof(Scp173TantrumAbility), nameof(Scp173TantrumAbility.Cooldown))), @@ -61,7 +58,7 @@ private static IEnumerable Transpiler(IEnumerable