Skip to content
Merged
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions api/src/main/java/me/tofaa/entitylib/ve/ViewerEngineListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.github.retrooper.packetevents.event.PacketListenerAbstract;
import com.github.retrooper.packetevents.event.PacketSendEvent;
import com.github.retrooper.packetevents.event.UserDisconnectEvent;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
import com.github.retrooper.packetevents.protocol.player.User;
Expand All @@ -11,6 +12,7 @@
import me.tofaa.entitylib.utils.Check;
import me.tofaa.entitylib.wrapper.WrapperEntity;

import java.util.UUID;
import java.util.function.Consumer;

final class ViewerEngineListener extends PacketListenerAbstract {
Expand Down Expand Up @@ -81,6 +83,24 @@ else if (type == PacketType.Play.Server.CHUNK_DATA) {
}
}

@Override
public void onUserDisconnect(final UserDisconnectEvent event) {
engine.getExecutor().execute(() -> {
final UUID uniqueId = event.getUser().getUUID();

// Note from Chubbyduck1: While this says it's non-null, it can actually be null in this case. Not sure why. When run without this, it would spam NPEs for me.
if (uniqueId == null) {
return;
}

engine.getTracked0().forEach(entity -> {
if (entity.hasViewer(uniqueId)) {
entity.removeViewerSilently(uniqueId);
}
});
});
}

Comment thread
coderabbitai[bot] marked this conversation as resolved.
private void genericSpawnCheck(int entityId, User user) {
WrapperEntity entity = EntityLib.getApi().getEntity(entityId);
if (entity == null) return;
Expand Down
Loading