2019-06-14 04:27:40 +02:00
|
|
|
From be58a582bccbf57742bbaee96357cebe907f3ef1 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
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
2019-05-28 01:01:45 +02:00
|
|
|
index 756330a6ca..66dda900b6 100644
|
2018-07-15 03:53:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
2019-04-27 05:05:36 +02:00
|
|
|
@@ -73,8 +73,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
2019-05-28 01:01:45 +02:00
|
|
|
this.b.close(chatmessage);
|
|
|
|
} else {
|
|
|
|
this.b.setPacketListener(new LoginListener(this.a, this.b));
|
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?
|
|
|
|
+ com.destroystokyo.paper.event.player.PlayerHandshakeEvent event = new com.destroystokyo.paper.event.player.PlayerHandshakeEvent(packethandshakinginsetprotocol.hostname, !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.b.sendPacket(new PacketLoginOutDisconnect(chatmessage));
|
|
|
|
+ this.b.close(chatmessage);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ packethandshakinginsetprotocol.hostname = event.getServerHostname();
|
2018-12-17 06:18:06 +01:00
|
|
|
+ this.b.socketAddress = new java.net.InetSocketAddress(event.getSocketAddressHostname(), ((java.net.InetSocketAddress) this.b.getSocketAddress()).getPort());
|
2018-07-15 03:53:17 +02:00
|
|
|
+ this.b.spoofedUUID = event.getUniqueId();
|
|
|
|
+ this.b.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
|
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");
|
|
|
|
if ( split.length == 3 || split.length == 4 ) {
|
|
|
|
packethandshakinginsetprotocol.hostname = split[0];
|
2018-07-15 03:53:17 +02:00
|
|
|
--
|
2019-04-23 06:47:07 +02:00
|
|
|
2.21.0
|
2018-07-15 03:53:17 +02:00
|
|
|
|