Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2b4ce0b37 Restore incremental player saving
This commit is contained in:
William Blake Galbreath
2020-08-16 10:00:17 -05:00
parent 9a376d0423
commit e1abdd5ab5
12 changed files with 42 additions and 42 deletions

View File

@@ -37,10 +37,10 @@ index e411f6280d..7ac4ce116e 100644
super(EntityTypes.PLAYER, world);
this.bS = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e5a81f8318..ecd0cd7752 100644
index c72cfd2bdf..d971f02354 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1753,8 +1753,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.ch = SystemUtils.getMonotonicMillis();