Should probably do an upstream update.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-24 19:29:30 +10:00
parent 75ed907450
commit caa031dbae
15 changed files with 55 additions and 63 deletions

View File

@@ -1,23 +1,23 @@
From b118d779aae057d1f31a057c7ed0102e90128af4 Mon Sep 17 00:00:00 2001
From 0a8a33e98273e97eed1086de950036935d1cd42a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 2191b07..5c9babf 100644
index 58e5217..f9ac1e1 100644
--- 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 {
public int newLevel = 0;
@@ -52,6 +52,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public int newTotalExp = 0;
public boolean keepLevel = false;
public double maxHealthCache;
+ 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
index a031af1..f0bc5c4 100644
index 388acf9..b7b1c45 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -719,6 +719,25 @@ public abstract class PlayerList {