From 2b1d55a0fcfae68661277f0311fe1f2d0990d716 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Sat, 15 Sep 2018 01:16:26 -0400
Subject: [PATCH] Expose original server in ServerPreConnectEvent

---
 .../api/event/player/ServerPreConnectEvent.java       | 11 +++++++++--
 .../proxy/connection/client/ConnectedPlayer.java      |  2 +-
 2 files changed, 10 insertions(+), 3 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 a91f819cd..c0ad88736 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
@@ -14,11 +14,13 @@ import java.util.Optional;
  */
 public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEvent.ServerResult> {
     private final Player player;
+    private final ServerInfo originalServer;
     private ServerResult result;
 
-    public ServerPreConnectEvent(Player player, ServerResult result) {
+    public ServerPreConnectEvent(Player player, ServerInfo originalServer) {
         this.player = Preconditions.checkNotNull(player, "player");
-        this.result = Preconditions.checkNotNull(result, "result");
+        this.originalServer = Preconditions.checkNotNull(originalServer, "originalServer");
+        this.result = ServerResult.allowed(originalServer);
     }
 
     public Player getPlayer() {
@@ -35,10 +37,15 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
         this.result = Preconditions.checkNotNull(result, "result");
     }
 
+    public ServerInfo getOriginalServer() {
+        return originalServer;
+    }
+
     @Override
     public String toString() {
         return "ServerPreConnectEvent{" +
                 "player=" + player +
+                ", originalServer=" + originalServer +
                 ", result=" + result +
                 '}';
     }
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 7f456191d..2d3bd80d9 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
@@ -275,7 +275,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
         }
 
         // Otherwise, initiate the connection.
-        ServerPreConnectEvent event = new ServerPreConnectEvent(this, ServerPreConnectEvent.ServerResult.allowed(request.getServer()));
+        ServerPreConnectEvent event = new ServerPreConnectEvent(this, request.getServer());
         return server.getEventManager().fire(event)
                 .thenCompose((newEvent) -> {
                     if (!newEvent.getResult().isAllowed()) {