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

35 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
2022-07-28 04:00:00 +10:00
@@ -37,11 +37,12 @@
2021-11-22 09:00:00 +11:00
MinecraftServer minecraftserver = this.serverConnectionListener.getServer();
int i = bytebuf.readableBytes();
String s;
+ org.bukkit.event.server.ServerListPingEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callServerListPingEvent(minecraftserver.server, inetsocketaddress.getAddress(), minecraftserver.getMotd(), minecraftserver.previewsChat(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers()); // CraftBukkit
switch (i) {
2019-05-28 06:30:00 +10:00
case 0:
LegacyPingHandler.LOGGER.debug("Ping: (<1.3.x) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
2022-07-28 04:00:00 +10:00
- s = String.format(Locale.ROOT, "%s\u00a7%d\u00a7%d", minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
+ s = String.format(Locale.ROOT, "%s\u00a7%d\u00a7%d", event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
2021-11-22 09:00:00 +11:00
this.sendFlushAndClose(channelhandlercontext, this.createReply(s));
2019-05-28 06:30:00 +10:00
break;
case 1:
2022-07-28 04:00:00 +10:00
@@ -50,7 +51,7 @@
2019-05-28 06:30:00 +10:00
}
2019-05-28 06:30:00 +10:00
LegacyPingHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
2022-07-28 04:00:00 +10:00
- s = String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
+ s = String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
2021-11-22 09:00:00 +11:00
this.sendFlushAndClose(channelhandlercontext, this.createReply(s));
2019-05-28 06:30:00 +10:00
break;
default:
2022-07-28 04:00:00 +10:00
@@ -69,7 +70,7 @@
2019-05-28 06:30:00 +10:00
}
2019-05-28 06:30:00 +10:00
LegacyPingHandler.LOGGER.debug("Ping: (1.6) from {}:{}", inetsocketaddress.getAddress(), inetsocketaddress.getPort());
2022-07-28 04:00:00 +10:00
- String s1 = String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), minecraftserver.getMotd(), minecraftserver.getPlayerCount(), minecraftserver.getMaxPlayers());
+ String s1 = String.format(Locale.ROOT, "\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, minecraftserver.getServerVersion(), event.getMotd(), event.getNumPlayers(), event.getMaxPlayers()); // CraftBukkit
2021-11-22 09:00:00 +11:00
ByteBuf bytebuf1 = this.createReply(s1);
2019-05-28 06:30:00 +10:00
try {