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

Do not allow connections till JoinGame is received.

Browse Source
This commit is contained in:
Andrew Steinborn
2018-11-23 15:37:17 -05:00
parent 81d8c8374e
commit e2ad6b740a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,7 +481,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
private Optional<ConnectionRequestBuilder.Status> checkServer(RegisteredServer server) { private Optional<ConnectionRequestBuilder.Status> checkServer(RegisteredServer server) {
Preconditions Preconditions
.checkState(server instanceof VelocityRegisteredServer, "Not a valid Velocity server."); .checkState(server instanceof VelocityRegisteredServer, "Not a valid Velocity server.");
if (connectionInFlight != null) { if (connectionInFlight != null || (connectedServer != null
&& !connectedServer.hasCompletedJoin())) {
return Optional.of(ConnectionRequestBuilder.Status.CONNECTION_IN_PROGRESS); return Optional.of(ConnectionRequestBuilder.Status.CONNECTION_IN_PROGRESS);
} }
if (connectedServer != null && connectedServer.getServer().equals(server)) { if (connectedServer != null && connectedServer.getServer().equals(server)) {