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

Clean up some connection checks

Browse Source
This commit is contained in:
Andrew Steinborn
2019-05-17 06:27:19 -04:00
parent 586be46bba
commit 40b2c9993b
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java
View File

@@ -134,11 +134,7 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
} }
private void startHandshake() { private void startHandshake() {
MinecraftConnection mc = connection; final MinecraftConnection mc = ensureConnected();
if (mc == null) {
throw new IllegalStateException("No connection established!");
}
PlayerInfoForwarding forwardingMode = server.getConfiguration().getPlayerInfoForwardingMode(); PlayerInfoForwarding forwardingMode = server.getConfiguration().getPlayerInfoForwardingMode();
// Initiate the handshake. // Initiate the handshake.
@@ -214,10 +210,7 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
Preconditions.checkNotNull(identifier, "identifier"); Preconditions.checkNotNull(identifier, "identifier");
Preconditions.checkNotNull(data, "data"); Preconditions.checkNotNull(data, "data");
MinecraftConnection mc = connection; MinecraftConnection mc = ensureConnected();
if (mc == null) {
throw new IllegalStateException("Not connected to a server!");
}
PluginMessage message = new PluginMessage(); PluginMessage message = new PluginMessage();
message.setChannel(identifier.getId()); message.setChannel(identifier.getId());