From c60ed56190ef9992cc9d574157b4e52eed3ccaff Mon Sep 17 00:00:00 2001 From: Emilia Kond Date: Sun, 14 Apr 2024 00:50:45 +0300 Subject: [PATCH] Fix stack trace when buying from sign when inventory full (#5761) --- .../src/main/java/com/earth2me/essentials/signs/SignBuy.java | 2 +- .../src/main/java/com/earth2me/essentials/signs/SignTrade.java | 2 +- Essentials/src/main/resources/messages.properties | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java index 76ca2045b34..8b59f79f62b 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java @@ -46,7 +46,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri charge.isAffordableFor(player); if (!items.pay(player)) { - throw new ChargeException("Inventory full"); //TODO: TL + throw new ChargeException("inventoryFull"); } charge.charge(player); Trade.log("Sign", "Buy", "Interact", username, charge, username, items, sign.getBlock().getLocation(), player.getMoney(), ess); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java index 39199faea59..f773eb2940f 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java @@ -72,7 +72,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri if (!trade.pay(player)) { subtractAmount(sign, 1, charge, ess); addAmount(sign, 2, trade, ess); - throw new ChargeException("Full inventory"); + throw new ChargeException("inventoryFull"); } charge.charge(player); Trade.log("Sign", "Trade", "Interact", sign.getLine(3).substring(2), charge, username, trade, sign.getBlock().getLocation(), player.getMoney(), ess); diff --git a/Essentials/src/main/resources/messages.properties b/Essentials/src/main/resources/messages.properties index 3c448af4170..c1d1bf84381 100644 --- a/Essentials/src/main/resources/messages.properties +++ b/Essentials/src/main/resources/messages.properties @@ -561,6 +561,7 @@ inventoryClearingAllArmor=Cleared all inventory items and armor fromCleared all inventory items from {0}. inventoryClearingFromAll=Clearing the inventory of all users... inventoryClearingStack=Removed {0} of {1} from {2}. +inventoryFull=Your inventory is full. invseeCommandDescription=See the inventory of other players. invseeCommandUsage=/ invseeCommandUsage1=/