Skip to content

Commit

Permalink
Merge branch 'dev' into scalenetwork
Browse files Browse the repository at this point in the history
  • Loading branch information
VALERA771 authored Aug 15, 2024
2 parents 87b4716 + afdb0b2 commit 3e0f04d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion EXILED/EXILED.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<PropertyGroup>
<!-- This is the global version and is used for all projects that don't have a version -->
<Version Condition="$(Version) == ''">8.12.0-rc.1</Version>
<Version Condition="$(Version) == ''">8.12.0-rc.3</Version>
<!-- Enables public beta warning via the PUBLIC_BETA constant -->
<PublicBeta>false</PublicBeta>

Expand Down
9 changes: 9 additions & 0 deletions EXILED/Exiled.API/Features/Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2478,6 +2478,15 @@ public void ResetAmmoLimit(AmmoType ammoType)
/// <returns>If the player has a custom limit for the specific <see cref="AmmoType"/>.</returns>
public bool HasCustomAmmoLimit(AmmoType ammoType) => CustomAmmoLimits.ContainsKey(ammoType);

/// <summary>
/// Gets the maximum amount of an <see cref="ItemCategory"/> the player can hold, based on the armor the player is wearing, as well as server configuration.
/// </summary>
/// <param name="category">The <see cref="ItemCategory"/> to check.</param>
/// <returns>The maximum amount of items in the category that the player can hold.</returns>
[Obsolete("Use Player::GetCategoryLimit(ItemCategory, bool) instead.")]
public int GetCategoryLimit(ItemCategory category) =>
InventorySystem.Configs.InventoryLimits.GetCategoryLimit(category, referenceHub);

/// <summary>
/// Gets the maximum amount of an <see cref="ItemCategory"/> the player can hold, based on the armor the player is wearing, as well as server configuration.
/// </summary>
Expand Down

0 comments on commit 3e0f04d

Please sign in to comment.