diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-08-10 10:41:03 +0600 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-08-10 10:41:03 +0600 |
| commit | 9068beec56d472279112826dda2b9a3aebb64659 (patch) | |
| tree | 81d2827a997be408e8084bea7be6d17be7e2b1e0 | |
| parent | 95e86f15d23bf660ec9fbc5952694f05160c9187 (diff) | |
| download | Essentials-9068beec56d472279112826dda2b9a3aebb64659.tar Essentials-9068beec56d472279112826dda2b9a3aebb64659.tar.gz Essentials-9068beec56d472279112826dda2b9a3aebb64659.tar.lz Essentials-9068beec56d472279112826dda2b9a3aebb64659.tar.xz Essentials-9068beec56d472279112826dda2b9a3aebb64659.zip | |
Fixing display timezone if the server isn't running GMT+1
| -rwxr-xr-x | Essentials/src/com/earth2me/essentials/DescParseTickFormat.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java index 1c8764149..21ca8feff 100755 --- a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java +++ b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java @@ -31,6 +31,8 @@ public final class DescParseTickFormat static { + SDFTwentyFour.setTimeZone(TimeZone.getTimeZone("GMT")); + SDFTwelve.setTimeZone(TimeZone.getTimeZone("GMT")); nameToTicks.put("sunrise", 23000); nameToTicks.put("rise", 23000); @@ -196,7 +198,7 @@ public final class DescParseTickFormat public static long hoursMinutesToTicks(final int hours, final int minutes) { long ret = ticksAtMidnight; - ret += (hours - 1) * ticksPerHour; + ret += (hours) * ticksPerHour; ret += (minutes / 60.0) * ticksPerHour; |