Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c8bc57c7 Cleanup ChunkMapDistance patch
276afaa2 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-07-04 21:30:16 -05:00
parent 81a9222684
commit 6d563f8de1
6 changed files with 171 additions and 143 deletions

View File

@@ -1,4 +1,4 @@
From b49bc7d1290687f2543fb66caee5febd7f9c1285 Mon Sep 17 00:00:00 2001
From d72e9dd07cc8f5ffe7b34d8fae1c86187c90b661 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index fb092a941..54c0b4247 100644
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9eccb787f..3c24ea3fa 100644
index 6a9786eb9..182235a92 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2161,4 +2161,11 @@ public final class CraftServer implements Server {
@@ -2163,4 +2163,11 @@ public final class CraftServer implements Server {
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
}
// Paper end