diff --git a/paper-server/patches/sources/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java.patch b/paper-server/patches/sources/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java.patch
index 3726e6d52..b87c81155 100644
--- a/paper-server/patches/sources/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java.patch
@@ -31,7 +31,7 @@
          switch (packet.intention()) {
              case LOGIN:
                  this.beginLogin(packet, false);
-@@ -59,19 +74,78 @@
+@@ -59,19 +74,112 @@
  
      private void beginLogin(ClientIntentionPacket packet, boolean transfer) {
          this.connection.setupOutboundProtocol(LoginProtocols.CLIENTBOUND);
@@ -85,9 +85,43 @@
              this.connection.disconnect((Component) ichatmutablecomponent);
          } else {
              this.connection.setupInboundProtocol(LoginProtocols.SERVERBOUND, new ServerLoginPacketListenerImpl(this.server, this.connection, transfer));
++            // Paper start - PlayerHandshakeEvent
++            boolean proxyLogicEnabled = org.spigotmc.SpigotConfig.bungee;
++            boolean handledByEvent = false;
++            // Try and handle the handshake through the event
++            if (com.destroystokyo.paper.event.player.PlayerHandshakeEvent.getHandlerList().getRegisteredListeners().length != 0) { // Hello? Can you hear me?
++                java.net.SocketAddress socketAddress = this.connection.address;
++                String hostnameOfRemote = socketAddress instanceof java.net.InetSocketAddress ? ((java.net.InetSocketAddress) socketAddress).getHostString() : InetAddress.getLoopbackAddress().getHostAddress();
++                com.destroystokyo.paper.event.player.PlayerHandshakeEvent event = new com.destroystokyo.paper.event.player.PlayerHandshakeEvent(packet.hostName(), hostnameOfRemote, !proxyLogicEnabled);
++                if (event.callEvent()) {
++                    // If we've failed somehow, let the client know so and go no further.
++                    if (event.isFailed()) {
++                        Component component = io.papermc.paper.adventure.PaperAdventure.asVanilla(event.failMessage());
++                        this.connection.send(new ClientboundLoginDisconnectPacket(component));
++                        this.connection.disconnect(component);
++                        return;
++                    }
++
++                    if (event.getServerHostname() != null) {
++                        // change hostname
++                        packet = new ClientIntentionPacket(
++                            packet.protocolVersion(),
++                            event.getServerHostname(),
++                            packet.port(),
++                            packet.intention()
++                        );
++                    }
++                    if (event.getSocketAddressHostname() != null) this.connection.address = new java.net.InetSocketAddress(event.getSocketAddressHostname(), socketAddress instanceof java.net.InetSocketAddress ? ((java.net.InetSocketAddress) socketAddress).getPort() : 0);
++                    this.connection.spoofedUUID = event.getUniqueId();
++                    this.connection.spoofedProfile = gson.fromJson(event.getPropertiesJson(), com.mojang.authlib.properties.Property[].class);
++                    handledByEvent = true; // Hooray, we did it!
++                }
++            }
++            // Paper end
 +            // Spigot Start
 +            String[] split = packet.hostName().split("\00");
-+            if (org.spigotmc.SpigotConfig.bungee) {
++            if (!handledByEvent && proxyLogicEnabled) { // Paper
++                // if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
 +                if ( ( split.length == 3 || split.length == 4 ) && ( ServerHandshakePacketListenerImpl.HOST_PATTERN.matcher( split[1] ).matches() ) ) {
 +                    this.connection.hostname = split[0];
 +                    this.connection.address = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getPort());