Skip to content

Fix removing negative items in /clearinventory #5899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JRoy merged 2 commits into from
Aug 11, 2024
Merged

Fix removing negative items in /clearinventory #5899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eb31f7
ensure amount of items is positive.
Evidentsinger14 Aug 11, 2024
202f556
Throw IAE in Inventories#removeItemAmount when amount < 0
JRoy Aug 11, 2024
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
9 changes: 7 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.utils.VersionUtil;
import net.ess3.api.TranslatableException;
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -80,7 +81,7 @@ private void parseCommand(final Server server, final CommandSource sender, final
}
}

protected void clearHandler(final CommandSource sender, final Player player, final String[] args, final int offset, final boolean showExtended) {
protected void clearHandler(final CommandSource sender, final Player player, final String[] args, final int offset, final boolean showExtended) throws TranslatableException {
ClearHandlerType type = ClearHandlerType.ALL_EXCEPT_ARMOR;
final Set<Item> items = new HashSet<>();
int amount = -1;
Expand Down Expand Up @@ -124,14 +125,18 @@ protected void clearHandler(final CommandSource sender, final Player player, fin
stack.setDurability(item.getData());
}

// can't remove a negative amount of items. (it adds them)
if (amount < -1) {
throw new TranslatableException("cannotRemoveNegativeItems");
}

// amount -1 means all items will be cleared
if (amount == -1) {
final int removedAmount = Inventories.removeItemSimilar(player, stack, true);
if (removedAmount > 0 || showExtended) {
sender.sendTl("inventoryClearingStack", removedAmount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName());
}
} else {
stack.setAmount(amount < 0 ? 1 : amount);
if (Inventories.removeItemAmount(player, stack, amount)) {
sender.sendTl("inventoryClearingStack", amount, stack.getType().toString().toLowerCase(Locale.ENGLISH), player.getDisplayName());
} else {
Expand Down
4 changes: 4 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/craftbukkit/Inventories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ public static int removeItems(final Player player, final Predicate<ItemStack> re
}

public static boolean removeItemAmount(final Player player, final ItemStack toRemove, int amount) {
if (amount < 0) {
throw new IllegalArgumentException("Amount cannot be negative.");
}

final List<Integer> clearSlots = new ArrayList<>();
final ItemStack[] items = player.getInventory().getContents();

Expand Down
1 change: 1 addition & 0 deletions Essentials/src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ burnMsg=<primary>You set<secondary> {0} <primary>on fire for<secondary> {1} seco
cannotSellNamedItem=<primary>You are not allowed to sell named items.
cannotSellTheseNamedItems=<primary>You are not allowed to sell these named items\: <dark_red>{0}
cannotStackMob=<dark_red>You do not have permission to stack multiple mobs.
cannotRemoveNegativeItems=<dark_red>You can not remove negative items.
canTalkAgain=<primary>You can now talk again.
cantFindGeoIpDB=Can''t find GeoIP database\!
cantGamemode=<dark_red>You do not have permission to change to gamemode {0}
Expand Down