Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a96d3e89 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-01 20:56:22 -05:00
parent 3b4e44ff44
commit eed34befaa
10 changed files with 35 additions and 35 deletions

View File

@@ -1,4 +1,4 @@
From d8fc6c9dbc51e6fc4cf815ea6db5c23e37ec1387 Mon Sep 17 00:00:00 2001
From 91814a6084e670f6fec1f0a3c07112a62b7dcbfd 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 6786fd094..8a9be3fdb 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 957baebc4..e7d60c114 100644
index efa1b59fa..b50a6eea3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2369,4 +2369,11 @@ public final class CraftServer implements Server {
@@ -2373,4 +2373,11 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end