Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a6ac47e5 Fix numerous item duplication issues and teleport issues
b7402f11 Add phantom creative and insomniac controls (#3222)
75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)

patches/server/0055-Bring-back-server-name.patch

@@ -1,41 +0,0 @@
-From 1297e8eb5780abad9be724575bd5bfbbf8c84bef 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
-
----
- .../java/net/minecraft/server/DedicatedServerProperties.java | 1 +
- src/main/java/org/bukkit/craftbukkit/CraftServer.java        | 5 +++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index 0c3ec83570..309f5562b8 100644
---- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-+++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-@@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
-     public final boolean onlineMode = this.getBoolean("online-mode", true);
-     public final boolean preventProxyConnections = this.getBoolean("prevent-proxy-connections", false);
-     public final String serverIp = this.getString("server-ip", "");
-+    public final String serverName = this.getString("server-name", "Unknown Server"); // Purpur
-     public final boolean spawnAnimals = this.getBoolean("spawn-animals", true);
-     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 5ecdea2ee0..6cebb2b7c1 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2240,6 +2240,11 @@ public final class CraftServer implements Server {
-     // Paper end
- 
-     // Purpur start
-+    @Override
-+    public String getServerName() {
-+        return getProperties().serverName;
-+    }
-+
-     @Override
-     public boolean isLagging() {
-         return getServer().lagging;
--- 
-2.24.0
-