From 1c24dc1defe0b1b5835dc1dc75fc9bec5ab287f0 Mon Sep 17 00:00:00 2001
From: Janik Bussalb <39597264+JanikBot@users.noreply.github.com>
Date: Tue, 14 Aug 2018 17:45:51 +0200
Subject: [PATCH 1/2] Added warning if user doesn't use the server version of
 the modpack

---
 minecraft-server/start-deployFTB | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/minecraft-server/start-deployFTB b/minecraft-server/start-deployFTB
index 0eae0e0d..5aaa1727 100755
--- a/minecraft-server/start-deployFTB
+++ b/minecraft-server/start-deployFTB
@@ -68,6 +68,11 @@ if [[ $startScriptCount = 0 ]]; then
   unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 fi
 
+if [ ! -f ./ServerStart.sh ]; then
+    echo "Please make sure you are using the server version of the FTB modpack!"
+    exit 2
+fi
+
 export FTB_SERVER_START=./ServerStart.sh
 export FTB_DIR=$(dirname $(find ${FTB_DIR} -name ServerStart.sh))
 chmod a+x ${FTB_DIR}/${FTB_SERVER_START}

From b910a7dbe58b32cf240d4a4a19de312131246d05 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 18 Aug 2018 15:38:27 -0500
Subject: [PATCH 2/2] mc: adjust FTB server pack check to look in subdirs

---
 minecraft-server/start-deployFTB | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/minecraft-server/start-deployFTB b/minecraft-server/start-deployFTB
index 5aaa1727..e70ad1b0 100755
--- a/minecraft-server/start-deployFTB
+++ b/minecraft-server/start-deployFTB
@@ -68,7 +68,7 @@ if [[ $startScriptCount = 0 ]]; then
   unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 fi
 
-if [ ! -f ./ServerStart.sh ]; then
+if [[ $(find ${FTB_BASE_DIR} -name ServerStart.sh |wc -l) = 0 ]]; then
     echo "Please make sure you are using the server version of the FTB modpack!"
     exit 2
 fi