From 2ab0d9f4e2a6952f81d87b718f883318bf3db26d Mon Sep 17 00:00:00 2001
From: Dijkstra <Dijkstra1@users.noreply.github.com>
Date: Thu, 17 Oct 2019 22:43:25 +0100
Subject: [PATCH 1/2] Adds 1.14 support

---
 ServerStart.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ServerStart.sh b/ServerStart.sh
index c09bd4a..43817d8 100755
--- a/ServerStart.sh
+++ b/ServerStart.sh
@@ -378,13 +378,18 @@ while $run ; do
         echo "Required files not found, need to install Forge"
         install_server
     fi
-    forge=$(ls forge*"$MC_SERVER_MCVER"*"$MC_SERVER_FORGEVER"*universal.jar 2>>logs/serverstart.log)
-    if [[ $? != 0 ]] ; then
+    forge=("$(ls forge*"$MC_SERVER_MCVER"*"$MC_SERVER_FORGEVER"*.jar)") 2>>logs/serverstart.log 2>&1
+    for file in ${forge[0]}; do
+        if [[ "$file" != *"installer"* ]]; then
+            export MC_SERVER_FORGE_JAR="${file}"
+            break
+        fi
+    done
+    if [[ -z $MC_SERVER_FORGE_JAR ]] ; then
         echo "WARN: no forge jar for MCVER: $MC_SERVER_MCVER and FORGEVER: $MC_SERVER_FORGEVER found"  >>logs/serverstart.log
         echo "Required files not found, need to install Forge"
         install_server
     else
-        export MC_SERVER_FORGE_JAR="${forge[0]}"
         echo "DEBUG: Found forge jar: $MC_SERVER_FORGE_JAR" >>logs/serverstart.log
     fi
     

From edfc54d6df515faf558363bf7ca3e08aec58322f Mon Sep 17 00:00:00 2001
From: Philip <philip@Philips-iMac.localdomain>
Date: Thu, 17 Oct 2019 22:57:53 +0100
Subject: [PATCH 2/2] macos testing

---
 ServerStart.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ServerStart.sh b/ServerStart.sh
index 43817d8..aae9db4 100755
--- a/ServerStart.sh
+++ b/ServerStart.sh
@@ -81,7 +81,7 @@ install_server(){
             export MC_SERVER_URL="${MC_SERVER_FORGEURL}"
         fi
         
-        command - v curl >> /dev/null 2>&1
+        command -v curl >> /dev/null 2>&1
         if [[ $? == 0 ]]; then
             echo "DEBUG: (curl) Downloading ${MC_SERVER_URL}" >>logs/serverstart.log 2>&1
             curl -OJL "${MC_SERVER_URL}" >>logs/serverstart.log 2>&1