Skip to content

Add bounds check for the /eco give action within Commandeco.java. #6617

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

Open
myfaultsys wants to merge 4 commits into
base: 2.x
Choose a base branch
from
+15 −2
Open

Add bounds check for the /eco give action within Commandeco.java. #6617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
addb9d4
Add bounds check for the give method within Commandeco.java.
myfaultsys Aug 31, 2026
48b171e
Add bounds check for the give method within Commandeco.java.
myfaultsys Aug 31, 2026
dadf925
Fix /pay allowing balance exceeding server's max-money setting
myfaultsys Sep 2, 2026
8c474fb
Fix /pay allowing balance to exceed server's max-money setting if wil…
myfaultsys Sep 2, 2026
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
8 changes: 7 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/commands/Commandeco.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@ public void run(final Server server, final CommandSource sender, final String co

switch (cmd) {
case GIVE: {
player.giveMoney(userAmount, sender, UserBalanceUpdateEvent.Cause.COMMAND_ECO);
final BigDecimal serverMaxBal = ess.getSettings().getMaxMoney();
final BigDecimal postTransactionBal = player.getMoney().add(userAmount);
if (postTransactionBal.compareTo(serverMaxBal) > 0) {
ess.showError(sender, new TranslatableException("maxMoney", AdventureUtil.parsed(NumberUtil.displayCurrency(serverMaxBal, ess))), commandLabel);
} else {
player.giveMoney(userAmount, sender, UserBalanceUpdateEvent.Cause.COMMAND_ECO);
}
break;
}
case TAKE: {
Expand Down
9 changes: 8 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/commands/Commandpay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public void run(final Server server, final User user, final String commandLabel,
user.sendTl("payOffline");
return;
}

if (!player.isAcceptingPay() || (ess.getSettings().isPayExcludesIgnoreList() && player.isIgnoredPlayer(user))) {
user.sendTl("notAcceptingPay", player.getDisplayName());
return;
Expand All @@ -80,6 +79,14 @@ public void run(final Server server, final User user, final String commandLabel,
user.getConfirmingPayments().put(player, amount);
return;
}
final BigDecimal serverMaxBal = ess.getSettings().getMaxMoney();
final BigDecimal postTransactionBal = player.getMoney().add(amount);
if (postTransactionBal.compareTo(serverMaxBal) > 0) {
if (!args[0].equals("*")) {
user.sendMessage("§c" + player.getDisplayName() + " would surpass the server's maximum balance limit!");
}
return;
}
user.payUser(player, amount, UserBalanceUpdateEvent.Cause.COMMAND_PAY);
user.getConfirmingPayments().remove(player);
Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), player.getName(), new Trade(amount, ess), user.getLocation(), user.getMoney(), ess);
Expand Down