118 Zeilen
5.2 KiB
Diff
118 Zeilen
5.2 KiB
Diff
--- a/net/minecraft/server/PacketStatusListener.java
|
|
+++ b/net/minecraft/server/PacketStatusListener.java
|
|
@@ -1,5 +1,16 @@
|
|
package net.minecraft.server;
|
|
|
|
+// CraftBukkit start
|
|
+import com.mojang.authlib.GameProfile;
|
|
+import io.netty.channel.ChannelFutureListener;
|
|
+import java.net.InetSocketAddress;
|
|
+import java.util.Iterator;
|
|
+
|
|
+import org.bukkit.craftbukkit.util.CraftIconCache;
|
|
+import org.bukkit.entity.Player;
|
|
+
|
|
+// CraftBukkit end
|
|
+
|
|
public class PacketStatusListener implements PacketStatusInListener {
|
|
|
|
private static final IChatBaseComponent a = new ChatMessage("multiplayer.status.request_handled", new Object[0]);
|
|
@@ -26,8 +37,96 @@
|
|
this.networkManager.close(PacketStatusListener.a);
|
|
} else {
|
|
this.d = true;
|
|
- this.networkManager.sendPacket(new PacketStatusOutServerInfo(this.minecraftServer.getServerPing()));
|
|
+ // CraftBukkit start
|
|
+ // this.networkManager.sendPacket(new PacketStatusOutServerInfo(this.minecraftServer.getServerPing()));
|
|
+ final Object[] players = minecraftServer.getPlayerList().players.toArray();
|
|
+ class ServerListPingEvent extends org.bukkit.event.server.ServerListPingEvent {
|
|
+
|
|
+ CraftIconCache icon = minecraftServer.server.getServerIcon();
|
|
+
|
|
+ ServerListPingEvent() {
|
|
+ super(((InetSocketAddress) networkManager.getSocketAddress()).getAddress(), minecraftServer.getMotd(), minecraftServer.getPlayerList().getMaxPlayers());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setServerIcon(org.bukkit.util.CachedServerIcon icon) {
|
|
+ if (!(icon instanceof CraftIconCache)) {
|
|
+ throw new IllegalArgumentException(icon + " was not created by " + org.bukkit.craftbukkit.CraftServer.class);
|
|
+ }
|
|
+ this.icon = (CraftIconCache) icon;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Iterator<Player> iterator() throws UnsupportedOperationException {
|
|
+ return new Iterator<Player>() {
|
|
+ int i;
|
|
+ int ret = Integer.MIN_VALUE;
|
|
+ EntityPlayer player;
|
|
+
|
|
+ @Override
|
|
+ public boolean hasNext() {
|
|
+ if (player != null) {
|
|
+ return true;
|
|
+ }
|
|
+ final Object[] currentPlayers = players;
|
|
+ for (int length = currentPlayers.length, i = this.i; i < length; i++) {
|
|
+ final EntityPlayer player = (EntityPlayer) currentPlayers[i];
|
|
+ if (player != null) {
|
|
+ this.i = i + 1;
|
|
+ this.player = player;
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Player next() {
|
|
+ if (!hasNext()) {
|
|
+ throw new java.util.NoSuchElementException();
|
|
+ }
|
|
+ final EntityPlayer player = this.player;
|
|
+ this.player = null;
|
|
+ this.ret = this.i - 1;
|
|
+ return player.getBukkitEntity();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void remove() {
|
|
+ final Object[] currentPlayers = players;
|
|
+ final int i = this.ret;
|
|
+ if (i < 0 || currentPlayers[i] == null) {
|
|
+ throw new IllegalStateException();
|
|
+ }
|
|
+ currentPlayers[i] = null;
|
|
+ }
|
|
+ };
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ServerListPingEvent event = new ServerListPingEvent();
|
|
+ this.minecraftServer.server.getPluginManager().callEvent(event);
|
|
+
|
|
+ java.util.List<GameProfile> profiles = new java.util.ArrayList<GameProfile>(players.length);
|
|
+ for (Object player : players) {
|
|
+ if (player != null) {
|
|
+ profiles.add(((EntityPlayer) player).getProfile());
|
|
+ }
|
|
+ }
|
|
+
|
|
+ ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size());
|
|
+ playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
|
|
+
|
|
+ ServerPing ping = new ServerPing();
|
|
+ ping.setFavicon(event.icon.value);
|
|
+ ping.setMOTD(new ChatComponentText(event.getMotd()));
|
|
+ ping.setPlayerSample(playerSample);
|
|
+ int version = SharedConstants.getGameVersion().getProtocolVersion();
|
|
+ ping.setServerInfo(new ServerPing.ServerData(minecraftServer.getServerModName() + " " + minecraftServer.getVersion(), version));
|
|
+
|
|
+ this.networkManager.sendPacket(new PacketStatusOutServerInfo(ping));
|
|
}
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
@Override
|