TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-02 18:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix /time not working with the '##pm' syntax.

Browse source
This commit is contained in:
KHobbits 2012-04-05 23:35:56 +01:00
parent aa43703094
commit bc876611d0
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
View file

@ -6,12 +6,11 @@ import java.util.*;
/** /**
* This utility class is used for converting between the ingame * This utility class is used for converting between the ingame time in ticks to ingame time as a friendly string. Note
* time in ticks to ingame time as a friendly string. * that the time is INGAME.
* Note that the time is INGAME. *
*
* http://www.minecraftwiki.net/wiki/Day/night_cycle * http://www.minecraftwiki.net/wiki/Day/night_cycle
* *
* @author Olof Larsson * @author Olof Larsson
*/ */
public final class DescParseTickFormat public final class DescParseTickFormat
@ -156,30 +155,31 @@ public final class DescParseTickFormat
int hours = 0; int hours = 0;
int minutes = 0; int minutes = 0;
desc = desc.toLowerCase(Locale.ENGLISH).replaceAll("[^0-9]", ""); desc = desc.toLowerCase(Locale.ENGLISH);
String parsetime = desc.replaceAll("[^0-9]", "");
if (desc.length() > 4) if (parsetime.length() > 4)
{ {
throw new NumberFormatException(); throw new NumberFormatException();
} }
if (desc.length() == 4) if (parsetime.length() == 4)
{ {
hours += Integer.parseInt(desc.substring(0, 2)); hours += Integer.parseInt(parsetime.substring(0, 2));
minutes += Integer.parseInt(desc.substring(2, 4)); minutes += Integer.parseInt(parsetime.substring(2, 4));
} }
else if (desc.length() == 3) else if (parsetime.length() == 3)
{ {
hours += Integer.parseInt(desc.substring(0, 1)); hours += Integer.parseInt(parsetime.substring(0, 1));
minutes += Integer.parseInt(desc.substring(1, 3)); minutes += Integer.parseInt(parsetime.substring(1, 3));
} }
else if (desc.length() == 2) else if (parsetime.length() == 2)
{ {
hours += Integer.parseInt(desc.substring(0, 2)); hours += Integer.parseInt(parsetime.substring(0, 2));
} }
else if (desc.length() == 1) else if (parsetime.length() == 1)
{ {
hours += Integer.parseInt(desc.substring(0, 1)); hours += Integer.parseInt(parsetime.substring(0, 1));
} }
else else
{ {