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
|
2023-09-23 00:33:14 +02:00
|
|
|
index 5b267514504497de3faa7ffa490a179200d9415c..faac9ba36d83f537fe62e177c15ae237059cc5cc 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
|
2023-09-23 00:33:14 +02:00
|
|
|
@@ -111,6 +111,10 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
|
|
|
@Nullable
|
|
|
|
BandwidthDebugMonitor bandwidthDebugMonitor;
|
|
|
|
public String hostname = ""; // CraftBukkit - add field
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start - NetworkClient implementation
|
|
|
|
+ public int protocolVersion;
|
|
|
|
+ public java.net.InetSocketAddress virtualHost;
|
|
|
|
+ // Paper end
|
|
|
|
|
2023-09-23 00:33:14 +02:00
|
|
|
// Paper start - add utility methods
|
|
|
|
public final net.minecraft.server.level.ServerPlayer getPlayer() {
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
2024-01-23 15:43:48 +01:00
|
|
|
index ce51bde4db395ff30c7d75e3badd68d6395fa40f..3dfec4462d85f3223071b4e78465587db6185f0d 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
|
2023-09-23 00:33:14 +02:00
|
|
|
@@ -165,6 +165,10 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
2023-09-21 22:35:39 +02:00
|
|
|
throw new UnsupportedOperationException("Invalid intention " + packet.intention());
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - NetworkClient implementation
|
2023-09-22 19:31:02 +02:00
|
|
|
+ this.connection.protocolVersion = packet.protocolVersion();
|
|
|
|
+ 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
|
2024-01-23 15:43:48 +01:00
|
|
|
index 028be33a35e2630cdd49aa03b58e3cf32e565d49..f35a53f6e4af319a4ce6f8e5dc8eb65edb47b6ed 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
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -289,6 +289,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) {
|