summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-04-04 02:07:01 +0100
committerKHobbits <rob@khobbits.co.uk>2012-04-04 02:07:01 +0100
commit2b99ed9a2a6d0894ea6bf121c1bdba17e8524e47 (patch)
treea2e0a971e37e4684fd12e271b725e0eb3a89a7a3
parenteeea16a99aece0b53a76f11a72879ce8b7a6ef5e (diff)
downloadEssentials-2b99ed9a2a6d0894ea6bf121c1bdba17e8524e47.tar
Essentials-2b99ed9a2a6d0894ea6bf121c1bdba17e8524e47.tar.gz
Essentials-2b99ed9a2a6d0894ea6bf121c1bdba17e8524e47.tar.lz
Essentials-2b99ed9a2a6d0894ea6bf121c1bdba17e8524e47.tar.xz
Essentials-2b99ed9a2a6d0894ea6bf121c1bdba17e8524e47.zip
Catch all values greater than 10 years to avoid exploits.
-rw-r--r--Essentials/src/com/earth2me/essentials/Util.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 78f31542c..73817f645 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -187,10 +187,6 @@ public class Util
throw new Exception(_("illegalDate"));
}
Calendar c = new GregorianCalendar();
- if (years > 10)
- {
- years = 10;
- }
if (years > 0)
{
c.add(Calendar.YEAR, years * (future ? 1 : -1));
@@ -219,6 +215,12 @@ public class Util
{
c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
}
+
+ Calendar max = new GregorianCalendar();
+ max.add(Calendar.YEAR, 10);
+ if (c.after(max)) {
+ return max.getTimeInMillis();
+ }
return c.getTimeInMillis();
}
// The player can stand inside these materials