2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-10-10 18:45:43 +02:00
|
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
|
|
Date: Tue, 10 Oct 2017 18:45:20 +0200
|
|
|
|
Subject: [PATCH] Expose client protocol version and virtual host
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
|
|
|
|
new file mode 100644
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..5caca6439d2135e34880d501397fe2ea197d7249
|
2017-10-10 18:45:43 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
|
|
|
|
@@ -0,0 +1,50 @@
|
|
|
|
+package com.destroystokyo.paper.network;
|
|
|
|
+
|
|
|
|
+import net.minecraft.server.NetworkManager;
|
|
|
|
+
|
|
|
|
+import java.net.InetSocketAddress;
|
|
|
|
+
|
|
|
|
+import javax.annotation.Nullable;
|
|
|
|
+
|
|
|
|
+public class PaperNetworkClient implements NetworkClient {
|
|
|
|
+
|
|
|
|
+ private final NetworkManager networkManager;
|
|
|
|
+
|
|
|
|
+ PaperNetworkClient(NetworkManager networkManager) {
|
|
|
|
+ this.networkManager = networkManager;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public InetSocketAddress getAddress() {
|
|
|
|
+ return (InetSocketAddress) this.networkManager.getSocketAddress();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int getProtocolVersion() {
|
|
|
|
+ return this.networkManager.protocolVersion;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Nullable
|
|
|
|
+ @Override
|
|
|
|
+ public InetSocketAddress getVirtualHost() {
|
|
|
|
+ return this.networkManager.virtualHost;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static InetSocketAddress prepareVirtualHost(String host, int port) {
|
|
|
|
+ int len = host.length();
|
|
|
|
+
|
|
|
|
+ // FML appends a marker to the host to recognize FML clients (\0FML\0)
|
|
|
|
+ int pos = host.indexOf('\0');
|
|
|
|
+ if (pos >= 0) {
|
|
|
|
+ len = pos;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // When clients connect with a SRV record, their host contains a trailing '.'
|
|
|
|
+ if (len > 0 && host.charAt(len - 1) == '.') {
|
|
|
|
+ len--;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return InetSocketAddress.createUnresolved(host.substring(0, len), port);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
2020-07-01 08:11:46 +02:00
|
|
|
index c0e3d18b0a528d6bca878f354bf8b4b417522c29..12fb251dc96bf179e393046ecc256ea80fdd79de 100644
|
2017-10-10 18:45:43 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
2020-06-25 15:11:48 +02:00
|
|
|
@@ -133,6 +133,10 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
2019-05-28 01:01:45 +02:00
|
|
|
throw new UnsupportedOperationException("Invalid intention " + packethandshakinginsetprotocol.b());
|
2017-10-10 18:45:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - NetworkClient implementation
|
|
|
|
+ this.getNetworkManager().protocolVersion = packethandshakinginsetprotocol.getProtocolVersion();
|
|
|
|
+ this.getNetworkManager().virtualHost = com.destroystokyo.paper.network.PaperNetworkClient.prepareVirtualHost(packethandshakinginsetprotocol.hostname, packethandshakinginsetprotocol.port);
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
2019-04-28 01:23:53 +02:00
|
|
|
@Override
|
2017-10-10 18:45:43 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
|
2020-06-25 15:11:48 +02:00
|
|
|
index c2fdccfb9192aa7ec55fd67c169cba71a695075c..33900c22d4123e0f8333b9bdb9601d302e26c972 100644
|
2017-10-10 18:45:43 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
2019-07-20 06:01:24 +02:00
|
|
|
@@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
|
|
|
private float s;
|
|
|
|
private int t;
|
|
|
|
private boolean u;
|
2017-10-10 18:45:43 +02:00
|
|
|
+ // Paper start - NetworkClient implementation
|
|
|
|
+ public int protocolVersion;
|
|
|
|
+ public java.net.InetSocketAddress virtualHost;
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
|
|
|
|
this.h = enumprotocoldirection;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 4f008e4723d2cb0bcabb2d5621203d63c40c4923..8545146fb1f093f821e3b966d9337049575c6773 100644
|
2017-10-10 18:45:43 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
|
2019-04-28 01:23:53 +02:00
|
|
|
@@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
|
2017-10-10 18:45:43 +02:00
|
|
|
return this.d;
|
|
|
|
}
|
|
|
|
|
2018-07-18 02:08:13 +02:00
|
|
|
+ public int getProtocolVersion() { return c(); } // Paper - OBFHELPER
|
|
|
|
public int c() {
|
2017-10-10 18:45:43 +02:00
|
|
|
return this.a;
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2020-07-01 08:11:46 +02:00
|
|
|
index 8776cfb8b5eda0b407af031747688e582c0c2bff..cc920cb20a7c1c77257e0219137775b362dfe602 100644
|
2017-10-10 18:45:43 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2020-06-25 15:11:48 +02:00
|
|
|
@@ -186,6 +186,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2017-10-10 18:45:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Implement NetworkClient
|
|
|
|
+ @Override
|
|
|
|
+ public int getProtocolVersion() {
|
|
|
|
+ if (getHandle().playerConnection == null) return -1;
|
|
|
|
+ return getHandle().playerConnection.networkManager.protocolVersion;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public InetSocketAddress getVirtualHost() {
|
|
|
|
+ if (getHandle().playerConnection == null) return null;
|
|
|
|
+ return getHandle().playerConnection.networkManager.virtualHost;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
2018-02-12 19:04:05 +01:00
|
|
|
public double getEyeHeight(boolean ignorePose) {
|
|
|
|
if (ignorePose) {
|