From c3fd559ac295d720a6a935f62e93a317f2c16f8b Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 12 Sep 2018 22:41:51 -0700
Subject: [PATCH] ServerPreConnectEvent#getInfo -> getServer

---
 .../api/event/player/ServerPreConnectEvent.java      | 12 ++++++------
 .../proxy/connection/client/ConnectedPlayer.java     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java b/api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java
index 2d86c06f8..a91f819cd 100644
--- a/api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java
+++ b/api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java
@@ -50,11 +50,11 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
         private static final ServerResult DENIED = new ServerResult(false, null);
 
         private final boolean allowed;
-        private final ServerInfo info;
+        private final ServerInfo server;
 
-        private ServerResult(boolean allowed, @Nullable ServerInfo info) {
+        private ServerResult(boolean allowed, @Nullable ServerInfo server) {
             this.allowed = allowed;
-            this.info = info;
+            this.server = server;
         }
 
         @Override
@@ -62,8 +62,8 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
             return allowed;
         }
 
-        public Optional<ServerInfo> getInfo() {
-            return Optional.ofNullable(info);
+        public Optional<ServerInfo> getServer() {
+            return Optional.ofNullable(server);
         }
 
         @Override
@@ -71,7 +71,7 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
             if (!allowed) {
                 return "denied";
             }
-            return "allowed: connect to " + info.getName();
+            return "allowed: connect to " + server.getName();
         }
 
         public static ServerResult denied() {
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
index 605a376d3..7f456191d 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -284,7 +284,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
                         );
                     }
 
-                    return new VelocityServerConnection(newEvent.getResult().getInfo().get(), this, server).connect();
+                    return new VelocityServerConnection(newEvent.getResult().getServer().get(), this, server).connect();
                 });
     }