2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
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
|
|
|
|
index 0000000000000000000000000000000000000000..a5a7624f1f372a26b982836cd31cff15e2589e9b
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
|
|
|
|
@@ -0,0 +1,49 @@
|
|
|
|
+package com.destroystokyo.paper.network;
|
|
|
|
+
|
|
|
|
+import java.net.InetSocketAddress;
|
|
|
|
+
|
|
|
|
+import javax.annotation.Nullable;
|
|
|
|
+import net.minecraft.network.Connection;
|
|
|
|
+
|
|
|
|
+public class PaperNetworkClient implements NetworkClient {
|
|
|
|
+
|
|
|
|
+ private final Connection networkManager;
|
|
|
|
+
|
|
|
|
+ PaperNetworkClient(Connection networkManager) {
|
|
|
|
+ this.networkManager = networkManager;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public InetSocketAddress getAddress() {
|
|
|
|
+ return (InetSocketAddress) this.networkManager.getRemoteAddress();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
|
2021-11-23 15:03:50 +01:00
|
|
|
index 7d177d38f3311ab941dd126c844d22e0018e25a1..84fe0f6cfc928d95d0967ad368a38afb71543af7 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/network/Connection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/network/Connection.java
|
2021-06-12 14:58:17 +02:00
|
|
|
@@ -83,6 +83,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
2021-06-11 14:02:28 +02:00
|
|
|
private float averageSentPackets;
|
|
|
|
private int tickCount;
|
|
|
|
private boolean handlingFault;
|
|
|
|
+ // Paper start - NetworkClient implementation
|
|
|
|
+ public int protocolVersion;
|
|
|
|
+ public java.net.InetSocketAddress virtualHost;
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
public Connection(PacketFlow side) {
|
|
|
|
this.receiving = side;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
2021-06-12 14:58:17 +02:00
|
|
|
index c4ba069f5124ec151e05813beddf293fddc3b804..484221e5a9c246aa91e0eacef3911b0e9ecff401 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
|
|
|
@@ -150,6 +150,10 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
|
|
|
throw new UnsupportedOperationException("Invalid intention " + packet.getIntention());
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - NetworkClient implementation
|
2021-06-12 14:58:17 +02:00
|
|
|
+ this.connection.protocolVersion = packet.getProtocolVersion();
|
|
|
|
+ this.connection.virtualHost = com.destroystokyo.paper.network.PaperNetworkClient.prepareVirtualHost(packet.hostName, packet.port);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2021-11-30 08:32:30 +01:00
|
|
|
index 91e29e47712f0469bacddbf2660f912115e1de68..5a62770e19adb7bbd6b220e068dce26990dbc8c4 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2021-11-26 23:58:39 +01:00
|
|
|
@@ -200,6 +200,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Implement NetworkClient
|
|
|
|
+ @Override
|
|
|
|
+ public int getProtocolVersion() {
|
|
|
|
+ if (getHandle().connection == null) return -1;
|
|
|
|
+ return getHandle().connection.connection.protocolVersion;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public InetSocketAddress getVirtualHost() {
|
|
|
|
+ if (getHandle().connection == null) return null;
|
|
|
|
+ return getHandle().connection.connection.virtualHost;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public double getEyeHeight(boolean ignorePose) {
|
|
|
|
if (ignorePose) {
|