Paper/CraftBukkit-Patches/0029-Enable-Improved-ping-sending.patch

67 lines
2.8 KiB
Diff
Raw Normal View History

2013-03-23 07:56:28 +01:00
From c9b8bc00e547b007a70f96813d3a838449ed56d1 Mon Sep 17 00:00:00 2001
2013-02-24 10:43:10 +01:00
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved ping sending
---
src/main/java/net/minecraft/server/EntityPlayer.java | 1 +
src/main/java/net/minecraft/server/PlayerList.java | 16 ++++++++++++++++
2013-02-26 01:19:08 +01:00
src/main/resources/configurations/bukkit.yml | 1 +
3 files changed, 18 insertions(+)
2013-02-24 10:43:10 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
2013-03-20 22:54:12 +01:00
index e6c5f91..bd8dfa7 100644
2013-02-24 10:43:10 +01:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
2013-02-24 10:43:10 +01:00
public int newLevel = 0;
public int newTotalExp = 0;
public boolean keepLevel = false;
+ 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-03-20 22:54:12 +01:00
index 79c52f6..c6513c8 100644
2013-02-24 10:43:10 +01:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -714,7 +714,23 @@ public abstract class PlayerList {
2013-02-24 10:43:10 +01:00
this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.ping));
}
// CraftBukkit end */
+ // Spigot start
+ if (this.players.size() == 0 || !org.bukkit.craftbukkit.Spigot.tabPing) {
+ return;
+ }
+ 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);
+ }
+ }
+ player.lastPing = player.ping;
+ }
}
+ // Spigot end
public void sendAll(Packet packet) {
for (int i = 0; i < this.players.size(); ++i) {
2013-02-26 01:19:08 +01:00
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
2013-03-23 07:56:28 +01:00
index ab8c5d6..3a875da 100644
2013-02-26 01:19:08 +01:00
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -31,6 +31,7 @@ settings:
command-complete: true
spam-exclusions:
- /skill
+ tab-ping: false
timeout-time: 30
restart-on-crash: false
restart-script-location: /path/to/server/start.sh
2013-02-24 10:43:10 +01:00
--
2013-03-22 23:48:22 +01:00
1.8.1-rc2
2013-02-24 10:43:10 +01:00