SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some merge conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-03-23 15:21:51 +11:00
parent 646c98c7d7
commit 61d5d29069
9 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0024-Enable-Improved-Ping-Sending.patch
View File

@@ -1,26 +1,26 @@
From 32b6c581167f920505e53027652b245c09997ba1 Mon Sep 17 00:00:00 2001
From 92495f9ed485c619523e3d5e4be1d122b590e6a3 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 d90ddb7..35284cf 100644
index 8d98a70..4c06a42 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -61,6 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public int newTotalExp = 0;
@@ -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
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 1943dbf..9f31630 100644
index 5b0590e..8b3d757 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -775,6 +775,25 @@ public abstract class PlayerList {
@@ -779,6 +779,25 @@ public abstract class PlayerList {
this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
}
// CraftBukkit end */
@@ -47,5 +47,5 @@ index 1943dbf..9f31630 100644
public void sendAll(Packet packet) {
--
1.8.5.2.msysgit.0
1.8.3.2