craftbukkit/nms-patches/net/minecraft/server/network/LegacyPingHandler.patch

46 lines
2.8 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/server/network/LegacyPingHandler.java
+++ b/net/minecraft/server/network/LegacyPingHandler.java
2025-03-26 03:05:00 +11:00
@@ -30,10 +30,11 @@
if (bytebuf.readUnsignedByte() == 254) {
2023-09-22 02:40:00 +10:00
SocketAddress socketaddress = channelhandlercontext.channel().remoteAddress();
int i = bytebuf.readableBytes();
+ org.bukkit.event.server.ServerListPingEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(socketaddress, server.getMotd(), server.getPlayerCount(), server.getMaxPlayers()); // CraftBukkit
2023-09-22 02:40:00 +10:00
if (i == 0) {
LegacyPingHandler.LOGGER.debug("Ping: (<1.3.x) from {}", socketaddress);
2025-03-26 03:05:00 +11:00
- String s = createVersion0Response(this.server);
+ String s = createVersion0Response(this.server, event); // CraftBukkit
2023-09-22 02:40:00 +10:00
sendFlushAndClose(channelhandlercontext, createLegacyDisconnectPacket(channelhandlercontext.alloc(), s));
} else {
2025-03-26 03:05:00 +11:00
@@ -51,7 +52,7 @@
2023-09-22 02:40:00 +10:00
LegacyPingHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", socketaddress);
2019-05-28 06:30:00 +10:00
}
2025-03-26 03:05:00 +11:00
- String s1 = createVersion1Response(this.server);
+ String s1 = createVersion1Response(this.server, event); // CraftBukkit
2023-09-22 02:40:00 +10:00
2025-03-26 03:05:00 +11:00
sendFlushAndClose(channelhandlercontext, createLegacyDisconnectPacket(channelhandlercontext.alloc(), s1));
}
@@ -104,12 +105,16 @@
2023-09-22 02:40:00 +10:00
}
}
- private static String createVersion0Response(ServerInfo serverinfo) {
- return String.format(Locale.ROOT, "%s\u00a7%d\u00a7%d", serverinfo.getMotd(), serverinfo.getPlayerCount(), serverinfo.getMaxPlayers());
+ // CraftBukkit start
+ private static String createVersion0Response(ServerInfo serverinfo, org.bukkit.event.server.ServerListPingEvent event) {
+ return String.format(Locale.ROOT, "%s\u00a7%d\u00a7%d", event.getMotd(), event.getNumPlayers(), event.getMaxPlayers());
+ // CraftBukkit end
}
2023-09-22 02:40:00 +10:00
- private static String createVersion1Response(ServerInfo serverinfo) {
- return String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, serverinfo.getServerVersion(), serverinfo.getMotd(), serverinfo.getPlayerCount(), serverinfo.getMaxPlayers());
+ // CraftBukkit start
+ private static String createVersion1Response(ServerInfo serverinfo, org.bukkit.event.server.ServerListPingEvent event) {
+ return String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, serverinfo.getServerVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers());
+ // CraftBukkit end
}
2023-09-22 02:40:00 +10:00
private static void sendFlushAndClose(ChannelHandlerContext channelhandlercontext, ByteBuf bytebuf) {