Elaria/AuxProtect-Folia
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow time ranges in /ap playtime

Browse Source
This commit is contained in:
Heliosares
2023-03-06 16:47:11 -05:00
parent 05d11212a9
commit fc7106033a
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dev/heliosares/auxprotect/core/commands/LookupCommand.java
View File

@@ -361,7 +361,11 @@ public class LookupCommand extends Command {
return;
}
String name = users.get(0);
sender.sendMessage(PlayTimeSolver.solvePlaytime(rs, params.getAfter(), (int) Math.round((double) (params.time_created - params.getAfter()) / (1000 * 3600)), name, plugin.getSenderAdapter(name) != null));
sender.sendMessage(PlayTimeSolver.solvePlaytime(rs,
params.getAfter(),
params.getBefore() == Long.MAX_VALUE ? System.currentTimeMillis() : params.getBefore(),
name,
plugin.getSenderAdapter(name) != null));
return;
} else if (params.getFlags().contains(Flag.ACTIVITY)) {
String uuid = sender.getUniqueId().toString();

13
src/dev/heliosares/auxprotect/utils/PlayTimeSolver.java
View File

@@ -18,10 +18,11 @@ import java.time.format.DateTimeFormatter;
import java.util.List;
public class PlayTimeSolver {
public static BaseComponent[] solvePlaytime(List<DbEntry> entries, long startTimeMillis, int hours, String player, final boolean currentlyOnline) {
public static BaseComponent[] solvePlaytime(List<DbEntry> entries, long startTimeMillis, long stopTimeMillis, String player, final boolean currentlyOnline) {
ComponentBuilder message = new ComponentBuilder().append("", FormatRetention.NONE);
final int limitDays = 60;
if (hours > limitDays * 24) {
final int hours = (int) Math.ceil((stopTimeMillis - startTimeMillis) / 3600000D);
if (hours - 1 > limitDays * 24) {
message.append(Language.L.COMMAND__LOOKUP__PLAYTIME__TOOLONG.translate(limitDays));
return message.create();
}
@@ -37,7 +38,7 @@ public class PlayTimeSolver {
long logout = 0;
boolean newLogin = false;
boolean newLogout = false;
double[] counter = new double[hours + 1];
double[] counter = new double[hours];
int hour = 0;
for (int i = entries.size() - 1; i >= 0; i--) {
DbEntry entry = entries.get(i);
@@ -134,12 +135,10 @@ public class PlayTimeSolver {
}
for (int i = counter.length; ; i++) {
LocalDateTime time = startTime.plusHours(i);
if (time.getHour() == 0) {
break;
}
if (time.getHour() == 0) break;
message.append(AuxProtectSpigot.BLOCK + "").color(ChatColor.BLACK).event((HoverEvent) null);
}
message.append(" " + LocalDateTime.now().format(formatterDate)).color(ChatColor.BLUE);
message.append(" " + startTime.plusHours(hours).format(formatterDate)).color(ChatColor.BLUE);
message.append(" (" + (Math.round(hourCount * 10.0) / 10.0) + "h)").color(ChatColor.GRAY)
.event((HoverEvent) null);
return message.create();