From a9be9812c5015718554118c906bf93a62172a014 Mon Sep 17 00:00:00 2001 From: VALERA771 <72030575+VALERA771@users.noreply.github.com> Date: Mon, 12 Aug 2024 02:38:03 +0300 Subject: [PATCH 1/6] no more breaching changes --- EXILED/Exiled.API/Features/Player.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 0885000f77..853beec7bd 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -2397,7 +2397,7 @@ public bool DropAmmo(AmmoType ammoType, ushort amount, bool checkMinimals = fals /// The of the ammo to check. /// If the method should ignore the armor the player is wearing. /// The maximum amount of ammo this player can carry. - public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor = false) + public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor) { if (ignoreArmor) { @@ -2411,6 +2411,17 @@ public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor = false) return InventorySystem.Configs.InventoryLimits.GetAmmoLimit(type.GetItemType(), referenceHub); } + /// + /// Gets the maximum amount of ammo the player can hold, given the ammo . + /// + /// The of the ammo to check. + /// The maximum amount of ammo this player can carry. + [Obsolete("Use Player::GetAmmoLimit(AmmoType, bool) instead.")] + public ushort GetAmmoLimit(AmmoType type) + { + return InventorySystem.Configs.InventoryLimits.GetAmmoLimit(type.GetItemType(), referenceHub); + } + /// /// Gets the maximum amount of ammo the player can hold, given the ammo . /// This limit will scale with the armor the player is wearing. From b51cf5165a933d63ff3dbf7d8c820fee3bdd4968 Mon Sep 17 00:00:00 2001 From: VALERA771 <72030575+VALERA771@users.noreply.github.com> Date: Mon, 12 Aug 2024 02:52:19 +0300 Subject: [PATCH 2/6] checking --- EXILED/Exiled.API/Features/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 853beec7bd..9b12340d4b 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -2397,7 +2397,7 @@ public bool DropAmmo(AmmoType ammoType, ushort amount, bool checkMinimals = fals /// The of the ammo to check. /// If the method should ignore the armor the player is wearing. /// The maximum amount of ammo this player can carry. - public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor) + public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor = false) { if (ignoreArmor) { From 2450b551dd8779640c1ac7ee2ff7faba2b036ead Mon Sep 17 00:00:00 2001 From: VALERA771 <72030575+VALERA771@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:01:10 +0300 Subject: [PATCH 3/6] Update Player.cs Co-authored-by: Nameless <85962933+Misfiy@users.noreply.github.com> --- EXILED/Exiled.API/Features/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 9b12340d4b..66cb6754d6 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -2419,7 +2419,7 @@ public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor = false) [Obsolete("Use Player::GetAmmoLimit(AmmoType, bool) instead.")] public ushort GetAmmoLimit(AmmoType type) { - return InventorySystem.Configs.InventoryLimits.GetAmmoLimit(type.GetItemType(), referenceHub); + return (int)InventorySystem.Configs.InventoryLimits.GetAmmoLimit(type.GetItemType(), referenceHub); } /// From d4f258e648f4095666f01f177bbbcc9793aeec92 Mon Sep 17 00:00:00 2001 From: VALERA771 <72030575+VALERA771@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:01:17 +0300 Subject: [PATCH 4/6] Update Player.cs Co-authored-by: Nameless <85962933+Misfiy@users.noreply.github.com> --- EXILED/Exiled.API/Features/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 66cb6754d6..3148172645 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -2417,7 +2417,7 @@ public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor = false) /// The of the ammo to check. /// The maximum amount of ammo this player can carry. [Obsolete("Use Player::GetAmmoLimit(AmmoType, bool) instead.")] - public ushort GetAmmoLimit(AmmoType type) + public int GetAmmoLimit(AmmoType type) { return (int)InventorySystem.Configs.InventoryLimits.GetAmmoLimit(type.GetItemType(), referenceHub); } From 0870e7b515e151334a1d80eebc5eb6e517678b81 Mon Sep 17 00:00:00 2001 From: VALERA771 <72030575+VALERA771@users.noreply.github.com> Date: Tue, 12 Aug 2025 20:47:06 +0300 Subject: [PATCH 5/6] Update LeadingTeam.cs --- EXILED/Exiled.API/Enums/LeadingTeam.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/EXILED/Exiled.API/Enums/LeadingTeam.cs b/EXILED/Exiled.API/Enums/LeadingTeam.cs index 01d62e6ec2..b136e854f0 100644 --- a/EXILED/Exiled.API/Enums/LeadingTeam.cs +++ b/EXILED/Exiled.API/Enums/LeadingTeam.cs @@ -35,9 +35,14 @@ public enum LeadingTeam : byte /// Anomalies, + /// + /// Represents the Flamingo team. + /// + Flamingo, + /// /// Represents a draw. /// Draw, } -} \ No newline at end of file +} From 38ea7277d4fa3ad05a1b9d74cbac467917cebf42 Mon Sep 17 00:00:00 2001 From: VALERA771 <72030575+VALERA771@users.noreply.github.com> Date: Tue, 12 Aug 2025 20:48:55 +0300 Subject: [PATCH 6/6] Update Player.cs --- EXILED/Exiled.API/Features/Player.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 627571a44c..960171e036 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -2533,17 +2533,6 @@ public ushort GetAmmoLimit(AmmoType type, bool ignoreArmor = false) return InventorySystem.Configs.InventoryLimits.GetAmmoLimit(type.GetItemType(), referenceHub); } - /// - /// Gets the maximum amount of ammo the player can hold, given the ammo . - /// - /// The of the ammo to check. - /// The maximum amount of ammo this player can carry. - [Obsolete("Use Player::GetAmmoLimit(AmmoType, bool) instead.")] - public int GetAmmoLimit(AmmoType type) - { - return (int)InventorySystem.Configs.InventoryLimits.GetAmmoLimit(type.GetItemType(), referenceHub); - } - /// /// Gets the maximum amount of ammo the player can hold, given the ammo . /// This limit will scale with the armor the player is wearing.