From 0667d6da84d92d80b6be70145083fa4cc5bd913c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved Ping Sending diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 27f9dc9..5788872 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public boolean keepLevel = false; public double maxHealthCache; public boolean joining = true; + public int lastPing = -1; // Spigot // CraftBukkit end // Spigot start public boolean collidesWithEntities = true; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index 25810d3..bf353e0 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -784,6 +784,8 @@ public abstract class PlayerList { // CraftBukkit end } + private int currentPing = 0; + public void tick() { if (++this.p > 600) { this.p = 0; @@ -796,6 +798,30 @@ public abstract class PlayerList { this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping)); } // CraftBukkit end */ + // Spigot start + try + { + if ( !players.isEmpty() ) + { + currentPing = ( currentPing + 1 ) % this.players.size(); + EntityPlayer player = (EntityPlayer) this.players.get( currentPing ); + if ( player.lastPing == -1 || Math.abs( player.ping - player.lastPing ) > 20 ) + { + Packet packet = new PacketPlayOutPlayerInfo( player.listName, true, player.ping ); + for ( EntityPlayer splayer : (List) this.players ) + { + if ( splayer.getBukkitEntity().canSee( player.getBukkitEntity() ) ) + { + splayer.playerConnection.sendPacket( packet ); + } + } + player.lastPing = player.ping; + } + } + } catch ( Exception e ) { + // Better safe than sorry :) + } + // Spigot end } public void sendAll(Packet packet) { -- 1.8.5.2.msysgit.0