Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle zero time diff better

Browse Source
This commit is contained in:
Olof Larsson 2013-10-10 14:29:20 +02:00
parent 480fcdc8b9
commit 5f692d215a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/mcore/util/TimeDiffUtil.java
View File

@ -71,6 +71,7 @@ public class TimeDiffUtil
if (!matcherFull.matches()) throw new NullPointerException("Invalid time diff format."); if (!matcherFull.matches()) throw new NullPointerException("Invalid time diff format.");
LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<TimeUnit, Long>(); LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<TimeUnit, Long>();
if (formated.equals("0")) return ret;
Matcher matcherPart = patternPart.matcher(formated); Matcher matcherPart = patternPart.matcher(formated);
while (matcherPart.find()) while (matcherPart.find())
@ -167,6 +168,11 @@ public class TimeDiffUtil
String comma = String.format(commaFormat, Txt.parse(color)); String comma = String.format(commaFormat, Txt.parse(color));
String and = String.format(andFormat, Txt.parse(color)); String and = String.format(andFormat, Txt.parse(color));
if (unitcounts.isEmpty())
{
return formated(TimeUnit.SECOND, 0, entryFormat);
}
List<String> parts = new ArrayList<String>(); List<String> parts = new ArrayList<String>();
for (Entry<TimeUnit, Long> entry : unitcounts.entrySet()) for (Entry<TimeUnit, Long> entry : unitcounts.entrySet())
{ {