Skip to content

Handle overlapping sessions of the same player #128

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
R00tB33rMan wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −6
Open

Handle overlapping sessions of the same player #128

Show file tree
Hide file tree
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
17 changes: 12 additions & 5 deletions invui/src/main/java/xyz/xenondevs/invui/internal/network/PacketListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,17 @@ private void handleJoin(PlayerJoinEvent event) {

@EventHandler(priority = EventPriority.MONITOR)
private void handleQuit(PlayerQuitEvent event) {
packetHandlers.remove(event.getPlayer().getUniqueId());
var player = event.getPlayer();
packetHandlers.computeIfPresent(player.getUniqueId(), (_, packetHandler) -> packetHandler.player == player ? null : packetHandler);
}

private void injectChannelHandler(Player player) {
if (packetHandlers.containsKey(player.getUniqueId()))
throw new IllegalStateException("A packet handler is already registered for this player");
var previous = packetHandlers.get(player.getUniqueId());
if (previous != null) {
if (previous.player == player)
throw new IllegalStateException("A packet handler is already registered for this player");
removeChannelHandler(previous.channel); // previous session of the same player that has not been removed yet
}

var channel = ((CraftPlayer) player).getHandle().connection.connection.channel;
var packetHandler = new PacketHandler(player, channel);
Expand All @@ -113,8 +118,10 @@ private void injectChannelHandler(Player player) {

private void removeChannelHandler(Player player) {
packetHandlers.remove(player.getUniqueId());
var channel = ((CraftPlayer) player).getHandle().connection.connection.channel;

removeChannelHandler(((CraftPlayer) player).getHandle().connection.connection.channel);
}

private void removeChannelHandler(Channel channel) {
try {
channel.pipeline().remove(invuiPacketHandlerName);
} catch (NoSuchElementException ignored) {
Expand Down
3 changes: 2 additions & 1 deletion invui/src/main/java/xyz/xenondevs/invui/window/WindowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ public Window getOpenWindow(Player player) {
private void handleInventoryClose(InventoryCloseEvent event) {
Player player = (Player) event.getPlayer();
AbstractWindow<?> window = (AbstractWindow<?>) getOpenWindow(player);
if (window != null) {
// Player#equals only compares uuids, so this may be the window of a newer session of the same player
if (window != null && window.getViewer() == player) {
window.handleClose(event.getReason());
}
}
Expand Down