From 2627317e03617fbe4de424e2effcd63df9798a46 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 16 Mar 2018 17:03:21 -0500
Subject: [PATCH] mc: Download Bukkit and Spigot from getbukkit.org

---
 minecraft-server/Dockerfile               |  3 ++-
 minecraft-server/start-deployBukkitSpigot | 25 +++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index 0ffb206a..bb4d1144 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -31,7 +31,6 @@ EXPOSE 25565 25575
 
 ADD https://github.com/itzg/restify/releases/download/1.0.4/restify_linux_amd64 /usr/local/bin/restify
 ADD https://github.com/itzg/rcon-cli/releases/download/1.3/rcon-cli_linux_amd64 /usr/local/bin/rcon-cli
-COPY start* /
 COPY mcadmin.jq /usr/share
 RUN chmod +x /usr/local/bin/*
 
@@ -47,3 +46,5 @@ ENV UID=1000 GID=1000 \
     TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= LEVEL=world \
     PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
     LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true
+
+COPY start* /
diff --git a/minecraft-server/start-deployBukkitSpigot b/minecraft-server/start-deployBukkitSpigot
index 1cff5bf9..fd84e22a 100755
--- a/minecraft-server/start-deployBukkitSpigot
+++ b/minecraft-server/start-deployBukkitSpigot
@@ -19,31 +19,30 @@ function downloadSpigot {
     *BUKKIT|*bukkit)
       match="Craftbukkit"
       downloadUrl=${BUKKIT_DOWNLOAD_URL}
+      getbukkitFlavor=craftbukkit
       ;;
     *)
       match="Spigot"
       downloadUrl=${SPIGOT_DOWNLOAD_URL}
+      getbukkitFlavor=spigot
       ;;
   esac
 
   if [[ -z $downloadUrl ]]; then
-    downloadUrl=$(restify --class=jar-div https://mcadmin.net/ | \
-      jq --arg version "$match $VANILLA_VERSION" -r -f /usr/share/mcadmin.jq)
-    if [[ -z $downloadUrl ]]; then
-      echo "ERROR: Version $VANILLA_VERSION is not supported for $TYPE"
-      echo "       Refer to https://mcadmin.net/ for supported versions"
-      exit 2
-    fi
+    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VERSION}.jar"
   fi
 
-  echo "Downloading $match"
-  curl -kfsSL -o $SERVER "$downloadUrl"
-  status=$?
-  if [ ! -f $SERVER ]; then
-    echo "ERROR: failed to download from $downloadUrl (status=$status)"
+  echo "Downloading $match ..."
+  if ! curl -fsSL -o $SERVER "$downloadUrl"; then
+    cat <<EOF
+
+ERROR: failed to download from $downloadUrl
+       Visit https://getbukkit.org/download/${getbukkitFlavor} to lookup the
+       exact version, such as 1.4.6-R0.4-SNAPSHOT
+
+EOF
     exit 3
   fi
-
 }