Skip to content

Add disconnect identity check debug logs & get CorePlayer directly #66

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

Merged
EarthCow merged 2 commits into from
May 30, 2026
Merged

Add disconnect identity check debug logs & get CorePlayer directly #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5046ddc
Velocity get CorePlayer directly & debug log identity check
EarthCow May 30, 2026
8551395
Bungee get CorePlayer directly & debug log identity check
EarthCow May 30, 2026
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
2 changes: 1 addition & 1 deletion src/main/java/xyz/earthcow/networkjoinmessages/bungee/BungeeMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void onEnable() {

getProxy()
.getPluginManager()
.registerListener(this, new PlayerListener(core.getCorePlayerListener()));
.registerListener(this, new PlayerListener(core.getCorePlayerListener(), bungeeLogger));

getProxy()
.getPluginManager()
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/xyz/earthcow/networkjoinmessages/bungee/listeners/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler;
import xyz.earthcow.networkjoinmessages.bungee.BungeeMain;
import xyz.earthcow.networkjoinmessages.bungee.abstraction.BungeeLogger;
import xyz.earthcow.networkjoinmessages.bungee.abstraction.BungeePlayer;
import xyz.earthcow.networkjoinmessages.bungee.abstraction.BungeeServer;
import xyz.earthcow.networkjoinmessages.common.abstraction.CorePlayer;
Expand All @@ -16,9 +17,11 @@
public class PlayerListener implements Listener {

private final CorePlayerListener corePlayerListener;
private final BungeeLogger logger;

public PlayerListener(CorePlayerListener corePlayerListener) {
public PlayerListener(CorePlayerListener corePlayerListener, BungeeLogger logger) {
this.corePlayerListener = corePlayerListener;
this.logger = logger;
}

@EventHandler
Expand All @@ -42,8 +45,10 @@ public void onServerConnected(ServerConnectedEvent e) {
@EventHandler
public void onDisconnect(PlayerDisconnectEvent event) {
// Check that the player disconnected is not a duplicate user session (the same account tries to join the server while already joined)
CorePlayer corePlayer = BungeeMain.getInstance().getOrPutPlayer(new BungeePlayer(event.getPlayer()));
if (corePlayer.getConnectionIdentity() != System.identityHashCode(event.getPlayer())) {
CorePlayer corePlayer = BungeeMain.getInstance().getPlayerManager().getPlayer(event.getPlayer().getUniqueId());
if (corePlayer == null || corePlayer.getConnectionIdentity() != System.identityHashCode(event.getPlayer())) {
logger.debug("Ignoring disconnect event for " + (corePlayer == null ? "null" : corePlayer.getName())
+ " (" + event.getPlayer().getName() + ") - null or duplicate player identity");
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/xyz/earthcow/networkjoinmessages/velocity/VelocityMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
velocityLogger.info("Successfully hooked into PremiumVanish!");
}

proxy.getEventManager().register(this, new PlayerListener(core.getCorePlayerListener()));
proxy.getEventManager().register(this, new PlayerListener(core.getCorePlayerListener(), velocityLogger));

registerCommands();

Expand Down
12 changes: 8 additions & 4 deletions src/main/java/xyz/earthcow/networkjoinmessages/velocity/listeners/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@
import xyz.earthcow.networkjoinmessages.common.abstraction.CorePlayer;
import xyz.earthcow.networkjoinmessages.common.listeners.CorePlayerListener;
import xyz.earthcow.networkjoinmessages.velocity.VelocityMain;
import xyz.earthcow.networkjoinmessages.velocity.abstraction.VelocityLogger;
import xyz.earthcow.networkjoinmessages.velocity.abstraction.VelocityPlayer;
import xyz.earthcow.networkjoinmessages.velocity.abstraction.VelocityServer;

public class PlayerListener {

private final CorePlayerListener corePlayerListener;
private final VelocityLogger logger;

public PlayerListener(CorePlayerListener corePlayerListener) {
public PlayerListener(CorePlayerListener corePlayerListener, VelocityLogger logger) {
this.corePlayerListener = corePlayerListener;
this.logger = logger;
}

@Subscribe
Expand All @@ -36,11 +39,12 @@ public void onServerConnected(ServerConnectedEvent event) {
@Subscribe
public void onDisconnect(DisconnectEvent event) {
// Check that the player disconnected is not a duplicate user session (the same account tries to join the server while already joined)
CorePlayer corePlayer = VelocityMain.getInstance().getOrPutPlayer(new VelocityPlayer(event.getPlayer()));
if (corePlayer.getConnectionIdentity() != System.identityHashCode(event.getPlayer())) {
CorePlayer corePlayer = VelocityMain.getInstance().getPlayerManager().getPlayer(event.getPlayer().getUniqueId());
if (corePlayer == null || corePlayer.getConnectionIdentity() != System.identityHashCode(event.getPlayer())) {
logger.debug("Ignoring disconnect event for " + (corePlayer == null ? "null" : corePlayer.getName())
+ " (" + event.getPlayer().getUsername() + ") - null or duplicate player identity");
return;
}

corePlayerListener.onDisconnect(corePlayer);
}
}
Loading