Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
3f5564f1 Port Optimize-Hoppers.patch to 1.15 (#2765)
This commit is contained in:
William Blake Galbreath
2019-12-22 14:26:09 -06:00
parent c4eb8206bc
commit 074110faf7
4 changed files with 10 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
From 4a95ea019473f8203a2d0e137ca873e647cb7d66 Mon Sep 17 00:00:00 2001
From d7157493340eae748625f3acbcb8a4880e092c96 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 cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 664c48d68..8596d1c2e 100644
index edb3a6035..f14d1b160 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1473,7 +1473,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1474,7 +1474,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {