Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
bc447dc1 Track correct branch for /version
7dbceea2 Restore zero-tick farms fix
55944bc6 Revert "Drop fix zero-tick farms (Fixes #2736)"
3b93c5b1 Drop fix zero-tick farms (Fixes #2736)
31bc07cb Drop hopper optimization patch
788e0338 Don't set the count on already empty items in hopper moves (Fixes #2735)
This commit is contained in:
William Blake Galbreath
2019-12-13 17:03:14 -06:00
parent 18ebfc0366
commit 4d725d77b8
6 changed files with 22 additions and 22 deletions

View File

@@ -1,4 +1,4 @@
From 7db14bbe9478f1d5e6a9fcc77e865ee4772cd1d3 Mon Sep 17 00:00:00 2001
From e958f6fd32c2078f4f4d0f98513001f56a7b7095 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
@@ -205,7 +205,7 @@ index cdc81ff1e2..2e74e46d5d 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 372b48fb2d..f6431f1de6 100644
index d5a0035124..6b28d84203 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -360,7 +360,7 @@ public class WorldServer extends World {
@@ -217,7 +217,7 @@ index 372b48fb2d..f6431f1de6 100644
})) {
this.C = false;
if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
@@ -631,7 +631,7 @@ public class WorldServer extends World {
@@ -633,7 +633,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();