summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNecrodoom <doomed.war@gmail.com>2013-04-30 20:03:54 +0300
committerKHobbits <rob@khobbits.co.uk>2013-05-04 18:26:34 +0100
commita65d0db57de000bea443a8a2fe0cabcc229af5bd (patch)
treea1edf20a6e7797cee499e4f6b01f2867a6d56cbf
parent479dad9966d43ff0a712e21fe0570a1fe3c23357 (diff)
downloadEssentials-a65d0db57de000bea443a8a2fe0cabcc229af5bd.tar
Essentials-a65d0db57de000bea443a8a2fe0cabcc229af5bd.tar.gz
Essentials-a65d0db57de000bea443a8a2fe0cabcc229af5bd.tar.lz
Essentials-a65d0db57de000bea443a8a2fe0cabcc229af5bd.tar.xz
Essentials-a65d0db57de000bea443a8a2fe0cabcc229af5bd.zip
Throw invalid kit message on invalid delay
-rw-r--r--Essentials/src/com/earth2me/essentials/Kit.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java
index 7d7aae780..e018832d0 100644
--- a/Essentials/src/com/earth2me/essentials/Kit.java
+++ b/Essentials/src/com/earth2me/essentials/Kit.java
@@ -59,7 +59,16 @@ public class Kit
final Calendar time = new GregorianCalendar();
// Take the current time, and remove the delay from it.
- final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
+ double delay = 0;
+ try
+ {
+ // Also make sure delay is valid
+ delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0.0d;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(_("kitError2"));
+ }
final Calendar earliestTime = new GregorianCalendar();
earliestTime.add(Calendar.SECOND, -(int)delay);
earliestTime.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0));