GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Fix issues with paper ping passthrough

Browse Source
This commit is contained in:
onebeastchris
2025-04-22 15:26:17 +02:00
parent a9c1da568a
commit eb73ed8fc5
2 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserPaperPingPassthrough.java
View File

@@ -37,6 +37,7 @@ import org.geysermc.geyser.ping.GeyserPingInfo;
import org.geysermc.geyser.ping.IGeyserPingPassthrough;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.InetSocketAddress;
/**
@@ -44,7 +45,10 @@ import java.net.InetSocketAddress;
* applied.
*/
public final class GeyserPaperPingPassthrough implements IGeyserPingPassthrough {
private static final Constructor<PaperServerListPingEvent> OLD_CONSTRUCTOR = ReflectedNames.getOldPaperPingConstructor();
private static final Constructor<PaperServerListPingEvent> EVENT_CONSTRUCTOR = ReflectedNames.paperServerListPingEventConstructor();
// https://jd.papermc.io/paper/1.19.2/com/destroystokyo/paper/event/server/PaperServerListPingEvent.html
private static final boolean CHAT_PREVIEWS = EVENT_CONSTRUCTOR.getParameters()[2].getType() == boolean.class;
private static final Method MOTD_COMPONENT_GETTER = ReflectedNames.motdGetter();
private final GeyserSpigotLogger logger;
@@ -57,18 +61,15 @@ public final class GeyserPaperPingPassthrough implements IGeyserPingPassthrough
@Override
public GeyserPingInfo getPingInformation(InetSocketAddress inetSocketAddress) {
try {
// We'd rather *not* use deprecations here, but unfortunately any Adventure class would be relocated at
// runtime because we still have to shade in our own Adventure class. For now.
PaperServerListPingEvent event;
if (OLD_CONSTRUCTOR != null) {
// 1.19, removed in 1.19.4
event = OLD_CONSTRUCTOR.newInstance(new GeyserStatusClient(inetSocketAddress),
Bukkit.getMotd(), Bukkit.getOnlinePlayers().size(),
Bukkit.getMaxPlayers(), Bukkit.getVersion(), GameProtocol.getJavaProtocolVersion(), null);
if (CHAT_PREVIEWS) {
event = EVENT_CONSTRUCTOR.newInstance(new GeyserStatusClient(inetSocketAddress),
MOTD_COMPONENT_GETTER.invoke(null), false, Bukkit.getOnlinePlayers().size(),
Bukkit.getMaxPlayers(), Bukkit.getVersion(), GameProtocol.getJavaProtocolVersion(), null);
} else {
event = new PaperServerListPingEvent(new GeyserStatusClient(inetSocketAddress),
Bukkit.getMotd(), Bukkit.getOnlinePlayers().size(),
Bukkit.getMaxPlayers(), Bukkit.getVersion(), GameProtocol.getJavaProtocolVersion(), null);
event = EVENT_CONSTRUCTOR.newInstance(new GeyserStatusClient(inetSocketAddress),
MOTD_COMPONENT_GETTER.invoke(null), Bukkit.getOnlinePlayers().size(),
Bukkit.getMaxPlayers(), Bukkit.getVersion(), GameProtocol.getJavaProtocolVersion(), null);
}
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {

38
bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/ReflectedNames.java
View File

@@ -26,12 +26,12 @@
package org.geysermc.geyser.platform.spigot;
import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
import com.destroystokyo.paper.network.StatusClient;
import org.bukkit.Bukkit;
import org.bukkit.event.server.ServerListPingEvent;
import org.bukkit.util.CachedServerIcon;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.InetAddress;
/**
@@ -42,8 +42,9 @@ public final class ReflectedNames {
static boolean checkPaperPingEvent() {
try {
Class.forName("com.destroystokyo.paper.event.server.PaperServerListPingEvent");
paperServerListPingEventConstructor();
return true;
} catch (ClassNotFoundException e) {
} catch (Throwable ignored) {
return false;
}
}
@@ -52,18 +53,27 @@ public final class ReflectedNames {
return getConstructor(ServerListPingEvent.class, InetAddress.class, String.class, boolean.class, int.class, int.class) != null;
}
static @Nullable Constructor<PaperServerListPingEvent> getOldPaperPingConstructor() {
if (getConstructor(PaperServerListPingEvent.class, StatusClient.class, String.class, int.class,
int.class, String.class, int.class, CachedServerIcon.class) != null) {
// @NotNull StatusClient client, @NotNull String motd, int numPlayers, int maxPlayers,
// @NotNull String version, int protocolVersion, @Nullable CachedServerIcon favicon
// New constructor is present
return null;
// Ugly workaround that's necessary due to relocation of adventure components
static Method motdGetter() {
try {
return Bukkit.class.getMethod("motd");
} catch (Throwable e) {
throw new RuntimeException("Could not find component motd method! Please report this issue.", e);
}
// @NotNull StatusClient client, @NotNull String motd, boolean shouldSendChatPreviews, int numPlayers, int maxPlayers,
// @NotNull String version, int protocolVersion, @Nullable CachedServerIcon favicon
return getConstructor(PaperServerListPingEvent.class, StatusClient.class, String.class, boolean.class, int.class, int.class,
String.class, int.class, CachedServerIcon.class);
}
@SuppressWarnings("unchecked")
static Constructor<PaperServerListPingEvent> paperServerListPingEventConstructor() {
var constructors = PaperServerListPingEvent.class.getConstructors();
for (var constructor : constructors) {
// We want to get the constructor with the adventure component motd, but without referencing the
// component class as that's relocated
if (constructor.getParameters()[1].getType() != String.class) {
return (Constructor<PaperServerListPingEvent>) constructor;
}
}
throw new IllegalStateException("Could not find component motd method!");
}
/**