Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 17:18:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix stack trace when buying from sign when inventory full (#5761)

Browse Source
This commit is contained in:
Emilia Kond 2024-04-14 00:50:45 +03:00 committed by GitHub
parent c85e179718
commit c60ed56190
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/main/java/com/earth2me/essentials/signs/SignBuy.java
View File

@ -46,7 +46,7 @@ public class SignBuy extends EssentialsSign {
charge.isAffordableFor(player); charge.isAffordableFor(player);
if (!items.pay(player)) { if (!items.pay(player)) {
throw new ChargeException("Inventory full"); //TODO: TL throw new ChargeException("inventoryFull");
} }
charge.charge(player); charge.charge(player);
Trade.log("Sign", "Buy", "Interact", username, charge, username, items, sign.getBlock().getLocation(), player.getMoney(), ess); Trade.log("Sign", "Buy", "Interact", username, charge, username, items, sign.getBlock().getLocation(), player.getMoney(), ess);

2
Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java
View File

@ -72,7 +72,7 @@ public class SignTrade extends EssentialsSign {
if (!trade.pay(player)) { if (!trade.pay(player)) {
subtractAmount(sign, 1, charge, ess); subtractAmount(sign, 1, charge, ess);
addAmount(sign, 2, trade, ess); addAmount(sign, 2, trade, ess);
throw new ChargeException("Full inventory"); throw new ChargeException("inventoryFull");
} }
charge.charge(player); charge.charge(player);
Trade.log("Sign", "Trade", "Interact", sign.getLine(3).substring(2), charge, username, trade, sign.getBlock().getLocation(), player.getMoney(), ess); Trade.log("Sign", "Trade", "Interact", sign.getLine(3).substring(2), charge, username, trade, sign.getBlock().getLocation(), player.getMoney(), ess);

1
Essentials/src/main/resources/messages.properties
View File

@ -561,6 +561,7 @@ inventoryClearingAllArmor=<primary>Cleared all inventory items and armor from<se
inventoryClearingAllItems=<primary>Cleared all inventory items from<secondary> {0}<primary>. inventoryClearingAllItems=<primary>Cleared all inventory items from<secondary> {0}<primary>.
inventoryClearingFromAll=<primary>Clearing the inventory of all users... inventoryClearingFromAll=<primary>Clearing the inventory of all users...
inventoryClearingStack=<primary>Removed<secondary> {0} <primary>of<secondary> {1} <primary>from<secondary> {2}<primary>. inventoryClearingStack=<primary>Removed<secondary> {0} <primary>of<secondary> {1} <primary>from<secondary> {2}<primary>.
inventoryFull=<dark_red>Your inventory is full.
invseeCommandDescription=See the inventory of other players. invseeCommandDescription=See the inventory of other players.
invseeCommandUsage=/<command> <player> invseeCommandUsage=/<command> <player>
invseeCommandUsage1=/<command> <player> invseeCommandUsage1=/<command> <player>