58 lines
4.2 KiB
Diff
58 lines
4.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
|
||
|
|
index 9b24afa4f4fe41d2261b16aaecec2144ac7d049f..1164782be686c91379494b236ebded817a002a6f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
|
||
|
|
@@ -29,7 +29,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
||
|
|
// 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;
|
||
|
|
@@ -88,8 +88,35 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
||
|
|
this.c.close(chatmessage);
|
||
|
|
} else {
|
||
|
|
this.c.setPacketListener(new LoginListener(this.b, this.c));
|
||
|
|
+ // 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?
|
||
|
|
+ java.net.SocketAddress socketAddress = this.getNetworkManager().socketAddress;
|
||
|
|
+ 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(packethandshakinginsetprotocol.hostname, hostnameOfRemote, !proxyLogicEnabled);
|
||
|
|
+ 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());
|
||
|
|
+ this.getNetworkManager().sendPacket(new PacketLoginOutDisconnect(chatmessage));
|
||
|
|
+ this.getNetworkManager().close(chatmessage);
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if (event.getServerHostname() != null) packethandshakinginsetprotocol.hostname = event.getServerHostname();
|
||
|
|
+ if (event.getSocketAddressHostname() != null) this.getNetworkManager().socketAddress = new java.net.InetSocketAddress(event.getSocketAddressHostname(), socketAddress instanceof java.net.InetSocketAddress ? ((java.net.InetSocketAddress) socketAddress).getPort() : 0);
|
||
|
|
+ this.getNetworkManager().spoofedUUID = event.getUniqueId();
|
||
|
|
+ this.getNetworkManager().spoofedProfile = gson.fromJson(event.getPropertiesJson(), com.mojang.authlib.properties.Property[].class);
|
||
|
|
+ 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
|
||
|
|
// Spigot Start
|
||
|
|
- if (org.spigotmc.SpigotConfig.bungee) {
|
||
|
|
+ //if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
|
||
|
|
String[] split = packethandshakinginsetprotocol.hostname.split("\00");
|
||
|
|
if ( ( split.length == 3 || split.length == 4 ) && ( HOST_PATTERN.matcher( split[1] ).matches() ) ) {
|
||
|
|
packethandshakinginsetprotocol.hostname = split[0];
|