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

Fix kick with /ap activity on 1.20.2

Browse Source
This commit is contained in:
Heliosares
2023-11-17 20:45:52 -05:00
parent b53103d10f
commit c2c3286de6
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/dev/heliosares/auxprotect/database/ActivityResults.java
View File

@@ -5,6 +5,7 @@ import dev.heliosares.auxprotect.core.IAuxProtect;
import dev.heliosares.auxprotect.core.Language;
import dev.heliosares.auxprotect.core.Parameters;
import dev.heliosares.auxprotect.utils.ActivitySolver;
import net.md_5.bungee.api.chat.BaseComponent;
import java.time.Instant;
import java.time.LocalDateTime;
@@ -21,8 +22,7 @@ public class ActivityResults extends Results {
rangeEnd = entries.get(0).getTime();
LocalDateTime startTime = Instant.ofEpochMilli(entries.get(entries.size() - 1).getTime())
.atZone(ZoneId.systemDefault()).toLocalDateTime().withMinute(0).withSecond(0).withNano(0);
LocalDateTime startTime = Instant.ofEpochMilli(entries.get(entries.size() - 1).getTime()).atZone(ZoneId.systemDefault()).toLocalDateTime().withMinute(0).withSecond(0).withNano(0);
rangeStart = startTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
}
@@ -41,8 +41,9 @@ public class ActivityResults extends Results {
// long thisRangeStart = rangeStart + (page - 1) * millisperpage;
long thisRangeEnd = rangeEnd - (getNumPages(perPage_) - page) * millisperpage;
player.sendMessage(ActivitySolver.solveActivity(getEntries(),
Math.max(thisRangeEnd - millisperpage, rangeStart), thisRangeEnd));
for (BaseComponent[] baseComponent : ActivitySolver.solveActivity(getEntries(), Math.max(thisRangeEnd - millisperpage, rangeStart), thisRangeEnd)) {
player.sendMessage(baseComponent);
}
super.sendArrowKeys(page);
}

15
src/main/java/dev/heliosares/auxprotect/utils/ActivitySolver.java
View File

@@ -17,11 +17,12 @@ import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ActivitySolver {
public static BaseComponent[] solveActivity(List<DbEntry> entries, long rangeStart, long rangeEnd) {
public static BaseComponent[][] solveActivity(List<DbEntry> entries, long rangeStart, long rangeEnd) {
ComponentBuilder message = new ComponentBuilder().append("", FormatRetention.NONE);
LocalDateTime startTime = Instant.ofEpochMilli(rangeStart).atZone(ZoneId.systemDefault()).toLocalDateTime()
.withSecond(0).withNano(0);
@@ -35,6 +36,11 @@ public class ActivitySolver {
StringBuilder line = new StringBuilder("" + ChatColor.COLOR_CHAR + "7" + ChatColor.COLOR_CHAR + "m");
line.append(String.valueOf((char) 65293).repeat(6));
line.append("" + ChatColor.COLOR_CHAR + "7");
List<BaseComponent[]> components = new ArrayList<>();
components.add(message.create());
message = new ComponentBuilder();
long lastTime = startMillis;
for (int i = entries.size() - 1, minute = 0; i >= 0; i--) {
DbEntry entry = entries.get(i);
@@ -87,8 +93,10 @@ public class ActivitySolver {
break;
}
if (time.getMinute() == 0) {
message.append(line + String.format("" + ChatColor.COLOR_CHAR + "f %s ", time.format(formatterHour)) + line + "\n")
message.append(line + String.format("" + ChatColor.COLOR_CHAR + "f %s ", time.format(formatterHour)) + line)
.event((ClickEvent) null).event((HoverEvent) null);
components.add(message.create());
message = new ComponentBuilder();
}
if (millis < newestEntryAt) {
message.append(AuxProtectSpigot.BLOCK + "").event((HoverEvent) null).event((ClickEvent) null);
@@ -134,6 +142,7 @@ public class ActivitySolver {
message.append("\n");
}
}
return message.create();
components.add(message.create());
return components.toArray(new BaseComponent[0][0]);
}
}