Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
49fdb182 Timings changes (#3044)
This commit is contained in:
William Blake Galbreath
2020-03-19 18:12:41 -05:00
parent 49de9d512e
commit 7273589372
5 changed files with 23 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
From bfec24048fcbf8603ebc427e8f8a018c38248df4 Mon Sep 17 00:00:00 2001
From 34500d05a6229d4d245a70708d55ab1cb994f43a 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
@@ -192,7 +192,7 @@ index 67afa457e8..2659da1881 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8eae813adc..baa0f885e5 100644
index 3e5dc93dff..ff38e6c69c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -746,7 +746,7 @@ public class WorldServer extends World {
@@ -204,7 +204,7 @@ index 8eae813adc..baa0f885e5 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -1051,7 +1051,7 @@ public class WorldServer extends World {
@@ -1050,7 +1050,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();