Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-28 03:57:48 +01:00
Code Issues Projects Releases Wiki Activity

midnight = 12am

Browse Source 
noon = 12pm
This commit is contained in:
snowleo 2011-08-23 13:20:35 +02:00
parent bb32ec9567
commit 5de354af86
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
View File

@ -155,10 +155,6 @@ public final class DescParseTickFormat
int hours = 0; int hours = 0;
int minutes = 0; int minutes = 0;
if (desc.endsWith("pm"))
{
hours += 12;
}
desc = desc.toLowerCase().replaceAll("[^0-9]", ""); desc = desc.toLowerCase().replaceAll("[^0-9]", "");
@ -189,6 +185,16 @@ public final class DescParseTickFormat
{ {
throw new NumberFormatException(); throw new NumberFormatException();
} }
if (desc.endsWith("pm") && hours != 12)
{
hours += 12;
}
if (desc.endsWith("am") && hours == 12)
{
hours -= 12;
}
return hoursMinutesToTicks(hours, minutes); return hoursMinutesToTicks(hours, minutes);
} }