Skip to content

fix: prevent PacketRecorder NPE on null payload ids #2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iLemon wants to merge 1 commit into
base: FeudalKings
Choose a base branch
from
Open

fix: prevent PacketRecorder NPE on null payload ids #2113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...ht-common/src/main/java/io/izzel/arclight/common/mod/plugin/messaging/PacketRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public PacketRecorder() {
unknown.defaultReturnValue(0);
}

public void recordUnknown(ResourceLocation id) {
public synchronized void recordUnknown(ResourceLocation id) {
if (id == null) {
ArclightServer.LOGGER.debug("Received packet with null id. This should never happen.");
return;
Expand All @@ -25,16 +25,23 @@ public void recordUnknown(ResourceLocation id) {
unknown.put(id, num + 1);
}

public void update() {
public synchronized void update() {
long now = Util.getMillis();
if (Math.abs(now - lastUpdate) > ArclightConstants.PACKET_RECORDER_PERIOD_SEC *1000) {
consumeAndLog();
lastUpdate = now;
}
}

public void consumeAndLog() {
public synchronized void consumeAndLog() {
String unknowns = unknown.object2IntEntrySet().stream()
.filter(it -> {
if (it.getKey() == null) {
ArclightServer.LOGGER.warn("Packet recorder encountered a null payload id entry; skipping corrupted record.");
return false;
}
return true;
})
.map(it -> it.getKey().toString() + '(' + it.getIntValue() + ')')
.collect(Collectors.joining(", ", "unknown=[", "];"));
unknown.clear();
Expand Down