46 lines
2.8 KiB
Diff
46 lines
2.8 KiB
Diff
--- a/net/minecraft/server/network/LegacyPingHandler.java
|
|
+++ b/net/minecraft/server/network/LegacyPingHandler.java
|
|
@@ -30,10 +30,11 @@
|
|
if (bytebuf.readUnsignedByte() == 254) {
|
|
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
|
|
|
|
if (i == 0) {
|
|
LegacyPingHandler.LOGGER.debug("Ping: (<1.3.x) from {}", socketaddress);
|
|
- String s = createVersion0Response(this.server);
|
|
+ String s = createVersion0Response(this.server, event); // CraftBukkit
|
|
|
|
sendFlushAndClose(channelhandlercontext, createLegacyDisconnectPacket(channelhandlercontext.alloc(), s));
|
|
} else {
|
|
@@ -51,7 +52,7 @@
|
|
LegacyPingHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", socketaddress);
|
|
}
|
|
|
|
- String s1 = createVersion1Response(this.server);
|
|
+ String s1 = createVersion1Response(this.server, event); // CraftBukkit
|
|
|
|
sendFlushAndClose(channelhandlercontext, createLegacyDisconnectPacket(channelhandlercontext.alloc(), s1));
|
|
}
|
|
@@ -104,12 +105,16 @@
|
|
}
|
|
}
|
|
|
|
- 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
|
|
}
|
|
|
|
- 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
|
|
}
|
|
|
|
private static void sendFlushAndClose(ChannelHandlerContext channelhandlercontext, ByteBuf bytebuf) {
|