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)

current-paper

@@ -1 +1 @@
-1.14.3--8a09ec0597392dd0a130182fb18bf9c6eeaa5ac2
+1.14.3--5751c8a21dea9a9437cec168280856bbb35e8550

patches/server/0002-Purpur-config-files.patch

@@ -1,4 +1,4 @@
-From 1ab49ab58a72b1c39551fac290c62791c1a0223d Mon Sep 17 00:00:00 2001
+From 2e9eb1dadfd676fce0e6e5a18cb5e80722cdf531 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -325,10 +325,10 @@ index 000000000..30f11fe26
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bb5aa677c..9eccb787f 100644
+index 6dfdc9813..6a9786eb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -791,6 +791,7 @@ public final class CraftServer implements Server {
+@@ -793,6 +793,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -336,7 +336,7 @@ index bb5aa677c..9eccb787f 100644
          for (WorldServer world : console.getWorlds()) {
              world.worldData.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -807,6 +808,7 @@ public final class CraftServer implements Server {
+@@ -809,6 +810,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper

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

@@ -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

scripts/upstreamCommit.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+(
+set -e
+PS1="$"
+
+function changelog() {
+    base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
+    cd $1 && git log --oneline ${base}...HEAD
+}
+paper=$(changelog Paper)
+
+updated=""
+logsuffix=""
+if [ ! -z "$paper" ]; then
+    logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
+    if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi
+fi
+disclaimer="Upstream has released updates that appears to apply and compile correctly"
+
+if [ ! -z "$1" ]; then
+    disclaimer="$@"
+fi
+
+log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
+
+echo -e "$log" | git commit -F -
+
+) || exit 1