Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-06 21:18:03 +02:00
Code Issues Projects Releases Wiki Activity

Cap mute/ban/jail to 10 years (any more is silly).

Browse Source 
Cap time descriptions to 3 significant notions.
This commit is contained in:
KHobbits 2012-04-04 01:55:06 +01:00
parent e52996609a
commit eeea16a99a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,11 +80,17 @@ public class Util
_("second"), _("second"),
_("seconds") _("seconds")
}; };
int accuracy = 0;
for (int i = 0; i < types.length; i++) for (int i = 0; i < types.length; i++)
{ {
if (accuracy > 2)
{
break;
}
int diff = dateDiff(types[i], fromDate, toDate, future); int diff = dateDiff(types[i], fromDate, toDate, future);
if (diff > 0) if (diff > 0)
{ {
accuracy++;
sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]); sb.append(" ").append(diff).append(" ").append(names[i * 2 + (diff > 1 ? 1 : 0)]);
} }
} }
@ -92,7 +98,7 @@ public class Util
{ {
return "now"; return "now";
} }
return sb.toString(); return sb.toString().trim();
} }
private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future) private static int dateDiff(int type, Calendar fromDate, Calendar toDate, boolean future)
@ -181,6 +187,10 @@ public class Util
throw new Exception(_("illegalDate")); throw new Exception(_("illegalDate"));
} }
Calendar c = new GregorianCalendar(); Calendar c = new GregorianCalendar();
if (years > 10)
{
years = 10;
}
if (years > 0) if (years > 0)
{ {
c.add(Calendar.YEAR, years * (future ? 1 : -1)); c.add(Calendar.YEAR, years * (future ? 1 : -1));
@ -250,7 +260,7 @@ public class Util
AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId()); AIR_MATERIALS.add(Material.PUMPKIN_STEM.getId());
AIR_MATERIALS.add(Material.MELON_STEM.getId()); AIR_MATERIALS.add(Material.MELON_STEM.getId());
AIR_MATERIALS.add(Material.VINE.getId()); AIR_MATERIALS.add(Material.VINE.getId());
AIR_MATERIALS.add(Material.FENCE_GATE.getId()); AIR_MATERIALS.add(Material.FENCE_GATE.getId());
AIR_MATERIALS.add(Material.WATER_LILY.getId()); AIR_MATERIALS.add(Material.WATER_LILY.getId());
AIR_MATERIALS.add(Material.NETHER_FENCE.getId()); AIR_MATERIALS.add(Material.NETHER_FENCE.getId());
AIR_MATERIALS.add(Material.NETHER_WARTS.getId()); AIR_MATERIALS.add(Material.NETHER_WARTS.getId());