MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add PRE_SERVER_JOIN to DisconnectEvent#LoginStatus (#346)

Browse Source
This commit is contained in:
Jacob Allen
2020-08-04 16:30:17 -04:00
committed by GitHub
parent 87bff1a123
commit 76173e4145
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/com/velocitypowered/api/event/connection/DisconnectEvent.java
View File

@@ -2,6 +2,7 @@ package com.velocitypowered.api.event.connection;
import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.CANCELLED_BY_PROXY; import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.CANCELLED_BY_PROXY;
import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.CONFLICTING_LOGIN; import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.CONFLICTING_LOGIN;
import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.PRE_SERVER_JOIN;
import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.SUCCESSFUL_LOGIN; import static com.velocitypowered.api.event.connection.DisconnectEvent.LoginStatus.SUCCESSFUL_LOGIN;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
@@ -59,6 +60,7 @@ public final class DisconnectEvent {
CONFLICTING_LOGIN, CONFLICTING_LOGIN,
CANCELLED_BY_USER, CANCELLED_BY_USER,
CANCELLED_BY_PROXY, CANCELLED_BY_PROXY,
CANCELLED_BY_USER_BEFORE_COMPLETE CANCELLED_BY_USER_BEFORE_COMPLETE,
PRE_SERVER_JOIN
} }
} }

8
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@@ -695,8 +695,12 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
DisconnectEvent.LoginStatus status; DisconnectEvent.LoginStatus status;
if (connectedPlayer.isPresent()) { if (connectedPlayer.isPresent()) {
status = connectedPlayer.get() == this ? LoginStatus.SUCCESSFUL_LOGIN if (!connectedPlayer.get().getCurrentServer().isPresent()) {
: LoginStatus.CONFLICTING_LOGIN; status = LoginStatus.PRE_SERVER_JOIN;
} else {
status = connectedPlayer.get() == this ? LoginStatus.SUCCESSFUL_LOGIN
: LoginStatus.CONFLICTING_LOGIN;
}
} else { } else {
status = connection.isKnownDisconnect() ? LoginStatus.CANCELLED_BY_PROXY : status = connection.isKnownDisconnect() ? LoginStatus.CANCELLED_BY_PROXY :
LoginStatus.CANCELLED_BY_USER; LoginStatus.CANCELLED_BY_USER;