Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-05-27 23:25:17 -05:00
parent 914c16f3b2
commit 81159a37d4
29 changed files with 64 additions and 49 deletions

View File

@@ -96,13 +96,13 @@ index 9836c0c5a..39f0f5a17 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 2ee915226..fd7fda511 100644
index fff461e3c..39311e1d1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
private static final Logger bV = LogManager.getLogger();
public String locale = null; // Spigot private -> public // Paper - default to null
public String locale = null; // PAIL: private -> public // Paper - default to null
+ public long lastSave = MinecraftServer.currentTick; // Paper
public PlayerConnection playerConnection;
public final MinecraftServer server;