Merge pull request #7 from ryantheleach/patch-1

OrdinatorStouff · web-flow · commit 285fb4b70b82 · 2017-07-13T16:34:19.000-07:00
Make spongeforge file check less strict
diff --git a/ServerStart.bat b/ServerStart.bat
@@ -455,8 +455,8 @@ IF %MC_SERVER_SPONGE% EQU 1 (
 		MKDIR "%~dp0mods" 1>>  "%~dp0serverstart.log" 2>&1
 	)
 	REM Check for spongeforge jar in /mods/
-	IF NOT EXIST "%~dp0mods/*spongeforge*%MC_SERVER_MCVER%*%MC_SERVER_FORGESHORT%*.jar" (
-		ECHO SpongeForge JAR for Forge %MC_SERVER_FORGESHORT% not found in "mods" folder...
+	IF NOT EXIST "%~dp0mods/*spongeforge*%MC_SERVER_MCVER%*.jar" (
+		ECHO SpongeForge JAR for not found in "mods" folder...
 		ECHO INFO: SpongeForge JAR not found in "mods" folder  1>>  "%~dp0serverstart.log" 2>&1
 		GOTO DOWNLOADSPONGE
 	)

Original file line number	Diff line number	Diff line change
`@@ -455,8 +455,8 @@ IF %MC_SERVER_SPONGE% EQU 1 (`
`455`	`455`	`MKDIR "%~dp0mods" 1>> "%~dp0serverstart.log" 2>&1`
`456`	`456`	`)`
`457`	`457`	`REM Check for spongeforge jar in /mods/`
`458`		`- IF NOT EXIST "%~dp0mods/spongeforge%MC_SERVER_MCVER%%MC_SERVER_FORGESHORT%.jar" (`
`459`		`- ECHO SpongeForge JAR for Forge %MC_SERVER_FORGESHORT% not found in "mods" folder...`
	`458`	`+ IF NOT EXIST "%~dp0mods/spongeforge%MC_SERVER_MCVER%*.jar" (`
	`459`	`+ ECHO SpongeForge JAR for not found in "mods" folder...`
`460`	`460`	`ECHO INFO: SpongeForge JAR not found in "mods" folder 1>> "%~dp0serverstart.log" 2>&1`
`461`	`461`	`GOTO DOWNLOADSPONGE`
`462`	`462`	`)`