Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
92933b16 Fix double dropping xp now that Spigot fixed it
This commit is contained in:
William Blake Galbreath
2019-12-26 21:31:10 -06:00
parent 3da51c1cfa
commit b3c97cc371
5 changed files with 11 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
From 56103c262c6b6c8963476f9c2b4feb4850ff7250 Mon Sep 17 00:00:00 2001
From 97354fff32f4f7933175fe81fa397d5252871483 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -49,10 +49,10 @@ index 57c528d53..3c9f18096 100644
super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 65b1f657f..6ce35b48a 100644
index 8565ad9c7..50a922ff1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1584,8 +1584,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1583,8 +1583,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();