mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2025-04-06 16:40:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix coding error that caused players to time out if moving to another server fails

Browse Source 
Thanks to @Gabik21 for noticing this bug.
This commit is contained in:
Andrew Steinborn 2020-08-30 20:59:04 -04:00
parent b26c9026d3
commit 60eef09fdd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,17 +430,20 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
}
KickedFromServerEvent originalEvent = new KickedFromServerEvent(this, rs, kickReason,
!kickedFromCurrent, result);
handleKickEvent(originalEvent, friendlyReason);
handleKickEvent(originalEvent, friendlyReason, kickedFromCurrent);
}
}
private void handleKickEvent(KickedFromServerEvent originalEvent, Component friendlyReason) {
private void handleKickEvent(KickedFromServerEvent originalEvent, Component friendlyReason,
boolean kickedFromCurrent) {
server.getEventManager().fire(originalEvent)
.thenAcceptAsync(event -> {
// There can't be any connection in flight now.
connectionInFlight = null;
// Make sure we clear the current connected server as the connection is invalid.
connectedServer = null;
if (kickedFromCurrent) {
connectedServer = null;
}
if (event.getResult() instanceof DisconnectPlayer) {
DisconnectPlayer res = (DisconnectPlayer) event.getResult();