summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-09-22 17:51:10 +0100
committerKHobbits <rob@khobbits.co.uk>2011-09-22 17:51:10 +0100
commitc597653ce2060f8bdaf4870b48e53aa214beb8a7 (patch)
treeb074b7c3d8d07394fe160df5d13ba41c3d4c4658
parentd9ceb727efc3697f4d279a73b1d6a27ff1dc4826 (diff)
parent2844af0039436d6bad73977418f32d854ea6eecc (diff)
downloadEssentials-c597653ce2060f8bdaf4870b48e53aa214beb8a7.tar
Essentials-c597653ce2060f8bdaf4870b48e53aa214beb8a7.tar.gz
Essentials-c597653ce2060f8bdaf4870b48e53aa214beb8a7.tar.lz
Essentials-c597653ce2060f8bdaf4870b48e53aa214beb8a7.tar.xz
Essentials-c597653ce2060f8bdaf4870b48e53aa214beb8a7.zip
Merge branch 'master' of github.com:essentials/Essentials into essmaster
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandmail.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java b/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
index 8b6dc8182..07710d40a 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
@@ -49,5 +49,6 @@ public class Commandinvsee extends EssentialsCommand
user.getInventory().setContents(invUserStack);
user.sendMessage(Util.format("invSee", invUser.getDisplayName()));
user.sendMessage(Util.i18n("invSeeHelp"));
+ throw new NoChargeException();
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
index a98fabbd2..e08a6c8e5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java
@@ -64,6 +64,6 @@ public class Commandmail extends EssentialsCommand
user.setMails(null);
throw new Exception(Util.i18n("mailCleared"));
}
- throw new NotEnoughArgumentsException();
+ throw new NoChargeException();
}
}