Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-10-01 08:27:27 +02:00
Code Issues Projects Releases Wiki Activity

Show erroneous message for invalid date and time, fixes #1437

Browse Source
This commit is contained in:
PikaMug 2020-11-03 22:23:09 -05:00
parent b81c8b83ba
commit 2c210484cc
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -463,7 +463,7 @@ public class Quester {
if (currentTime < start) {
String early = Lang.get("plnTooEarly");
early = early.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.YELLOW);
early = early.replace("<time>", ChatColor.DARK_PURPLE
early = early.replace("<time>", ChatColor.RED
+ MiscUtil.getTime(start - currentTime) + ChatColor.YELLOW);
p.sendMessage(ChatColor.YELLOW + early);
return;

30
main/src/main/java/me/blackvein/quests/util/MiscUtil.java
View File

@ -29,7 +29,7 @@ public class MiscUtil {
* @return Converted time in text
*/
public static String getTime(final long milliseconds) {
String message = "";
final StringBuilder sb = new StringBuilder();
final long days = milliseconds / 86400000;
final long hours = (milliseconds % 86400000) / 3600000;
final long minutes = ((milliseconds % 86400000) % 3600000) / 60000;
@ -37,44 +37,46 @@ public class MiscUtil {
final long milliSeconds2 = (((milliseconds % 86400000) % 3600000) % 60000) % 1000;
if (days > 0L) {
if (days == 1L) {
message += " 1 " + Lang.get("timeDay") + ",";
sb.append(" 1 " + Lang.get("timeDay") + ",");
} else {
message += " " + days + " " + Lang.get("timeDays") + ",";
sb.append(" " + days + " " + Lang.get("timeDays") + ",");
}
}
if (hours > 0L) {
if (hours == 1L) {
message += " 1 " + Lang.get("timeHour") + ",";
sb.append(" 1 " + Lang.get("timeHour") + ",");
} else {
message += " " + hours + " " + Lang.get("timeHours") + ",";
sb.append(" " + hours + " " + Lang.get("timeHours") + ",");
}
}
if (minutes > 0L) {
if (minutes == 1L) {
message += " 1 " + Lang.get("timeMinute") + ",";
sb.append(" 1 " + Lang.get("timeMinute") + ",");
} else {
message += " " + minutes + " " + Lang.get("timeMinutes") + ",";
sb.append(" " + minutes + " " + Lang.get("timeMinutes") + ",");
}
}
if (seconds > 0L) {
if (seconds == 1L) {
message += " 1 " + Lang.get("timeSecond") + ",";
sb.append(" 1 " + Lang.get("timeSecond") + ",");
} else {
message += " " + seconds + " " + Lang.get("timeSeconds") + ",";
sb.append(" " + seconds + " " + Lang.get("timeSeconds") + ",");
}
} else {
if (milliSeconds2 > 0L) {
if (milliSeconds2 == 1L) {
message += " 1 " + Lang.get("timeMillisecond") + ",";
sb.append(" 1 " + Lang.get("timeMillisecond") + ",");
} else {
message += " " + milliSeconds2 + " " + Lang.get("timeMilliseconds") + ",";
sb.append(" " + milliSeconds2 + " " + Lang.get("timeMilliseconds") + ",");
}
}
}
if (message.length() > 0) {
message = message.substring(1, message.length() - 1);
if (sb.length() > 0) {
sb.append(sb.substring(1, sb.length() - 1));
} else {
sb.append("-1 " + Lang.get("timeSeconds"));
}
return message;
return sb.toString();
}
/**