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 58d81920448221d19814f2900b539bdd3409f33a Mon Sep 17 00:00:00 2001
From 22b94a39b6069106fd8525f79d1c009e85bfef80 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -86,10 +86,10 @@ index cd6e259239..bb227bc0fb 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index edb3a60355..f14d1b160a 100644
index 664c48d688..8596d1c2e6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1474,7 +1474,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1473,7 +1473,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {