2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-07-15 03:53:17 +02:00
From: kashike <kashike@vq.lc>
Date: Wed, 13 Apr 2016 20:21:38 -0700
Subject: [PATCH] Add handshake event to allow plugins to handle client
handshaking logic themselves
2021-03-16 08:19:45 +01:00
diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
2021-04-28 01:38:35 +02:00
index 9b24afa4f4fe41d2261b16aaecec2144ac7d049f..5047a742d2e6a9749aa7d37e761d023a3425944b 100644
2021-03-16 08:19:45 +01:00
--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
2021-04-28 01:38:35 +02:00
@@ -29,7 +29,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
2020-06-25 13:00:35 +02:00
// CraftBukkit end
private static final IChatBaseComponent a = new ChatComponentText("Ignoring status request");
private final MinecraftServer b;
- private final NetworkManager c;
+ private final NetworkManager c; final NetworkManager getNetworkManager() { return this.c; } // Paper - OBFHELPER
public HandshakeListener(MinecraftServer minecraftserver, NetworkManager networkmanager) {
this.b = minecraftserver;
2021-04-28 01:38:35 +02:00
@@ -88,8 +88,34 @@ public class HandshakeListener implements PacketHandshakingInListener {
2020-06-25 13:00:35 +02:00
this.c.close(chatmessage);
2019-05-28 01:01:45 +02:00
} else {
2020-06-25 13:00:35 +02:00
this.c.setPacketListener(new LoginListener(this.b, this.c));
2018-07-15 03:53:17 +02:00
+ // Paper start - handshake event
+ 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?
2021-02-23 16:47:06 +01:00
+ java.net.InetSocketAddress socketAddress = (java.net.InetSocketAddress) this.getNetworkManager().socketAddress;
+ com.destroystokyo.paper.event.player.PlayerHandshakeEvent event = new com.destroystokyo.paper.event.player.PlayerHandshakeEvent(packethandshakinginsetprotocol.hostname, socketAddress.getAddress().getHostAddress(), !proxyLogicEnabled);
2018-07-15 03:53:17 +02:00
+ if (event.callEvent()) {
+ // If we've failed somehow, let the client know so and go no further.
+ if (event.isFailed()) {
+ chatmessage = new ChatMessage(event.getFailMessage());
2020-06-25 13:00:35 +02:00
+ this.getNetworkManager().sendPacket(new PacketLoginOutDisconnect(chatmessage));
+ this.getNetworkManager().close(chatmessage);
2018-07-15 03:53:17 +02:00
+ return;
+ }
+
2020-12-16 21:43:09 +01:00
+ if (event.getServerHostname() != null) packethandshakinginsetprotocol.hostname = event.getServerHostname();
2021-02-23 16:47:06 +01:00
+ if (event.getSocketAddressHostname() != null) this.getNetworkManager().socketAddress = new java.net.InetSocketAddress(event.getSocketAddressHostname(), socketAddress.getPort());
2020-06-25 13:00:35 +02:00
+ this.getNetworkManager().spoofedUUID = event.getUniqueId();
+ this.getNetworkManager().spoofedProfile = gson.fromJson(event.getPropertiesJson(), com.mojang.authlib.properties.Property[].class);
2018-07-15 03:53:17 +02:00
+ handledByEvent = true; // Hooray, we did it!
+ }
+ }
+ // Don't try and handle default logic if it's been handled by the event.
+ if (!handledByEvent && proxyLogicEnabled) {
+ // Paper end
2019-05-28 01:01:45 +02:00
// Spigot Start
- if (org.spigotmc.SpigotConfig.bungee) {
2018-07-15 03:53:17 +02:00
+ //if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
2019-05-28 01:01:45 +02:00
String[] split = packethandshakinginsetprotocol.hostname.split("\00");
2021-04-28 01:38:35 +02:00
if ( ( split.length == 3 || split.length == 4 ) && ( HOST_PATTERN.matcher( split[1] ).matches() ) ) {
2019-05-28 01:01:45 +02:00
packethandshakinginsetprotocol.hostname = split[0];