2014-03-26 16:18:11 +01:00
|
|
|
From dbc277885ec999d8e9ea208555b85b0e4baa34c1 Mon Sep 17 00:00:00 2001
|
2013-04-13 09:11:24 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sun, 24 Feb 2013 20:45:20 +1100
|
2013-06-21 09:41:26 +02:00
|
|
|
Subject: [PATCH] Enable Improved Ping Sending
|
2013-04-13 09:11:24 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2014-03-23 05:21:51 +01:00
|
|
|
index 8d98a70..4c06a42 100644
|
2013-04-13 09:11:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2014-03-23 05:21:51 +01:00
|
|
|
@@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2013-04-13 09:11:24 +02:00
|
|
|
public boolean keepLevel = false;
|
2013-07-24 11:29:30 +02:00
|
|
|
public double maxHealthCache;
|
2014-03-23 05:21:51 +01:00
|
|
|
public boolean joining = true;
|
2013-04-13 09:11:24 +02:00
|
|
|
+ public int lastPing = -1; // Spigot
|
|
|
|
// CraftBukkit end
|
|
|
|
|
2013-12-01 04:40:53 +01:00
|
|
|
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
|
2013-04-13 09:11:24 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2014-03-26 16:18:11 +01:00
|
|
|
index 5b0590e..273439a 100644
|
2013-04-13 09:11:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2014-03-23 05:21:51 +01:00
|
|
|
@@ -779,6 +779,25 @@ public abstract class PlayerList {
|
2013-12-01 04:40:53 +01:00
|
|
|
this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
|
2013-04-13 09:11:24 +02:00
|
|
|
}
|
|
|
|
// CraftBukkit end */
|
|
|
|
+ // Spigot start
|
2013-06-21 09:41:26 +02:00
|
|
|
+ if ( !players.isEmpty() )
|
|
|
|
+ {
|
2014-03-26 16:18:11 +01:00
|
|
|
+ int index = Math.abs( MinecraftServer.currentTick ) % this.players.size();
|
2013-06-21 09:41:26 +02:00
|
|
|
+ EntityPlayer player = (EntityPlayer) this.players.get( index );
|
|
|
|
+ if ( player.lastPing == -1 || Math.abs( player.ping - player.lastPing ) > 20 )
|
|
|
|
+ {
|
2013-12-01 06:00:50 +01:00
|
|
|
+ Packet packet = new PacketPlayOutPlayerInfo( player.listName, true, player.ping );
|
2013-06-21 09:41:26 +02:00
|
|
|
+ for ( EntityPlayer splayer : (List<EntityPlayer>) this.players )
|
|
|
|
+ {
|
|
|
|
+ if ( splayer.getBukkitEntity().canSee( player.getBukkitEntity() ) )
|
|
|
|
+ {
|
|
|
|
+ splayer.playerConnection.sendPacket( packet );
|
|
|
|
+ }
|
2013-04-13 09:11:24 +02:00
|
|
|
+ }
|
2013-06-21 09:41:26 +02:00
|
|
|
+ player.lastPing = player.ping;
|
2013-04-13 09:11:24 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
2013-06-21 09:41:26 +02:00
|
|
|
+ // Spigot end
|
2013-04-13 09:11:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void sendAll(Packet packet) {
|
|
|
|
--
|
2014-03-26 16:18:11 +01:00
|
|
|
1.8.5.2.msysgit.0
|
2013-04-13 09:11:24 +02:00
|
|
|
|