PaperMC/CraftBukkit-Patches/0031-Enable-Improved-Ping-Sending.patch

52 lines
2.2 KiB
Diff
Raw Normal View History

2013-07-24 11:29:30 +02:00
From 0a8a33e98273e97eed1086de950036935d1cd42a 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
2013-07-24 11:29:30 +02:00
index 58e5217..f9ac1e1 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
2013-07-24 11:29:30 +02:00
@@ -52,6 +52,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2013-04-13 09:11:24 +02:00
public int newTotalExp = 0;
public boolean keepLevel = false;
2013-07-24 11:29:30 +02:00
public double maxHealthCache;
2013-04-13 09:11:24 +02:00
+ public int lastPing = -1; // Spigot
// CraftBukkit end
public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2013-07-24 11:29:30 +02:00
index 388acf9..b7b1c45 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
2013-07-09 02:31:10 +02:00
@@ -719,6 +719,25 @@ public abstract class PlayerList {
2013-07-02 05:03:56 +02:00
this.sendAll(new Packet201PlayerInfo(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() )
+ {
+ int index = MinecraftServer.currentTick % this.players.size();
+ EntityPlayer player = (EntityPlayer) this.players.get( index );
+ if ( player.lastPing == -1 || Math.abs( player.ping - player.lastPing ) > 20 )
+ {
+ Packet packet = new Packet201PlayerInfo( player.listName, true, player.ping );
+ 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) {
--
1.8.1.2
2013-04-13 09:11:24 +02:00