From d7b0f74a75b26722abca402eaef92a0a0e06af06 Mon Sep 17 00:00:00 2001 From: vemacs Date: Tue, 28 Jul 2015 19:20:47 -0600 Subject: [PATCH] Give money back to sender if MaxMoneyException thrown (fixes #106) --- .../src/com/earth2me/essentials/commands/Commandpay.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java index 9de9e35d5..3702bfb75 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java @@ -43,6 +43,11 @@ public class Commandpay extends EssentialsLoopCommand { Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), player.getName(), new Trade(amount, ess), user.getLocation(), ess); } catch (MaxMoneyException ex) { sender.sendMessage(tl("maxMoney")); + try { + user.setMoney(user.getMoney().add(amount)); + } catch (MaxMoneyException ignored) { + // this should never happen + } } } }