Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions EXILED/Exiled.API/Features/Player.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2119,6 +2119,50 @@
/// <returns>dropped <see cref="Pickup"/>.</returns>
public Pickup DropItem(Item item) => item is not null ? Pickup.Get(Inventory.ServerDropItem(item.Serial)) : null;

/// <summary>
/// Drops an <see cref="Item"/> from the player's inventory by its <see cref="ItemType"/>.
/// </summary>
/// <param name="item">The specified <see cref="ItemType"/> to be dropped.</param>
/// <param name="isThrown">Whether the item should be thrown.</param>
/// <param name="amount">The number of matching items to remove.</param>
/// <returns>A value indicating whether the <see cref="Item"/> was dropped.</returns>
public bool DropItem(ItemType item, bool isThrown = false, int amount = 1)
{
if (amount <= 0)
return false;

List<Item> itemsToDrop = Items.Where(i => i?.Type == item).Take(amount).ToList();

if (itemsToDrop.Count == 0)
return false;

foreach (Item i in itemsToDrop)
DropItem(i, isThrown);

return itemsToDrop.Count > 0;
}

/// <summary>
/// Drops an item from the player's inventory.
/// </summary>
/// <param name="item">The specified <see cref="ItemType"/> to be dropped.</param>
/// <param name="amount">The number of matching items to remove.</param>
/// <returns>A list of dropped <see cref="Pickup"/>s.</returns>
public List<Pickup> DropItem(ItemType item, int amount = 1)
{
List<Pickup> pickups = new();

if (amount <= 0)
return pickups;

List<Item> itemsToDrop = Items.Where(i => i?.Type == item).Take(amount).ToList();

foreach (Item i in itemsToDrop)
pickups.Add(DropItem(i));

return pickups;
}

/// <summary>
/// Drops the held item. Will not do anything if the player is not holding an item.
/// </summary>
Expand Down Expand Up @@ -2226,6 +2270,28 @@
return true;
}

/// <summary>
/// Removes an <see cref="Item"/> from the player's inventory by its <see cref="ItemType"/>.
/// </summary>
/// <param name="item">The specified <see cref="ItemType"/> to be removed.</param>
/// <param name="destroy">Whether to destroy the item.</param>
/// <param name="amount">The number of matching items to remove.</param>
/// <returns>A value indicating whether the <see cref="Item"/> was removed.</returns>
public bool RemoveItem(ItemType item, bool destroy = true, int amount = 1)
{
if (amount <= 0)
return false;

List<Item> itemsToRemove = Items.Where(i => i?.Type == item).Take(amount).ToList();

if (itemsToRemove.Count == 0)
return false;

foreach (Item i in itemsToRemove)
RemoveItem(i, destroy);

return true;
}
/// <summary>
/// Removes an <see cref="Item"/> from the player's inventory.
/// </summary>
Expand Down Expand Up @@ -2276,8 +2342,8 @@

/// <summary>
/// Disconnects the player.
/// </summary>

Check failure on line 2345 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Check failure on line 2345 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Check failure on line 2345 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Check failure on line 2345 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Check failure on line 2345 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

/// <param name="reason">The disconnection reason.</param>

Check failure on line 2346 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Element documentation header should be preceded by blank line (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1514.md)

Check failure on line 2346 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Element documentation header should be preceded by blank line (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1514.md)

Check failure on line 2346 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Element documentation header should be preceded by blank line (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1514.md)

Check failure on line 2346 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Element documentation header should be preceded by blank line (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1514.md)

Check failure on line 2346 in EXILED/Exiled.API/Features/Player.cs

View workflow job for this annotation

GitHub Actions / build

Element documentation header should be preceded by blank line (https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1514.md)
public void Disconnect(string reason = null) =>
ServerConsole.Disconnect(GameObject, string.IsNullOrEmpty(reason) ? string.Empty : reason);

Expand Down
Loading