From 94be098282fe602efdf5ae1b69015c95cac5b1be Mon Sep 17 00:00:00 2001
From: Jason Ho <git@hogt.me>
Date: Sat, 16 Sep 2023 15:34:51 -0700
Subject: [PATCH] fail downloads on error, use a different url for downloading
 minecraft jar

---
 scripts/apply.sh     | 3 +++
 scripts/baseremap.sh | 2 +-
 scripts/upstream.sh  | 3 +++
 sportpaper           | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/apply.sh b/scripts/apply.sh
index fa6f4065b..00631d2f7 100755
--- a/scripts/apply.sh
+++ b/scripts/apply.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 # get base dir regardless of execution location
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
diff --git a/scripts/baseremap.sh b/scripts/baseremap.sh
index 26c6509d4..ac38f35f2 100755
--- a/scripts/baseremap.sh
+++ b/scripts/baseremap.sh
@@ -23,7 +23,7 @@ jarpath="$workdir/$minecraftversion/$minecraftversion"
 echo "Downloading unmapped vanilla jar..."
 if [ ! -f  "$jarpath.jar" ]; then
     mkdir -p "$workdir/$minecraftversion"
-    curl -s -o "$jarpath.jar" "https://s3.amazonaws.com/Minecraft.Download/versions/$minecraftversion/minecraft_server.$minecraftversion.jar"
+    curl -s -o "$jarpath.jar" "https://launcher.mojang.com/v1/objects/5fafba3f58c40dc51b5c3ca72a98f62dfdae1db7/server.jar"
     if [ "$?" != "0" ]; then
         echo "Failed to download the vanilla server jar. Check connectivity or try again later."
         exit 1
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
index bdf671127..aaf65b08a 100755
--- a/scripts/upstream.sh
+++ b/scripts/upstream.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 # get base dir regardless of execution location
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
diff --git a/sportpaper b/sportpaper
index 0b2cde685..541151be0 100755
--- a/sportpaper
+++ b/sportpaper
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 # get base dir regardless of execution location
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink