diff --git a/scripts/prepareServerJars.sh b/scripts/prepareServerJars.sh
index da1bb6e2f..526433084 100644
--- a/scripts/prepareServerJars.sh
+++ b/scripts/prepareServerJars.sh
@@ -1,19 +1,12 @@
 mkdir $HOME/servers
 mkdir $HOME/servers/build
 
-cd $HOME/servers
-
-SPIGOT_FOUND=[[ -e spigot.jar ]]
-CRAFTBUKKIT_FOUND=[[ -e craftbukkit.jar ]]
-SPONGE_FOUND=[[ -e sponge.jar ]]
-
-
-cd $HOME/servers/build
-
 wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 git config --global --unset core.autocrlf
 
-if [ ! $SPIGOT_FOUND ]; then
+cd $HOME/servers
+if [ ! -e spigot.jar ]; then
+	cd $HOME/servers/build
 	echo "Building spigot 1.12.2"
 	java -jar BuildTools.jar --rev 1.12.2
 	cp spigot-1.12.2.jar ../spigot.jar
@@ -21,7 +14,9 @@ else
 	echo "Found spigot 1.12.2 jar"
 fi
 
-if [ ! $CRAFTBUKKIT_FOUND ]; then
+cd $HOME/servers
+if [ ! -e craftbukkit.jar ]; then
+	cd $HOME/servers/build
 	echo "Building craftbukkit 1.8"
 	java -jar BuildTools.jar --rev 1.8
 	cp craftbukkit-1.8.jar ../craftbukkit.jar
@@ -29,7 +24,9 @@ else
 	echo "Found craftbukkit 1.8 jar"
 fi
 
-if [ ! $SPONGE_FOUND ]; then
+cd $HOME/servers
+if [ ! -e sponge.jar ]; then
+	cd $HOME/servers/build
 	echo "Downloading sponge"
 	wget -O sponge.jar https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/1.12.2-7.1.4/spongevanilla-1.12.2-7.1.4.jar
 	cp sponge.jar ../sponge.jar
@@ -40,4 +37,4 @@ fi
 
 cd $HOME/servers
 rm -rf build
-cd $HOME
\ No newline at end of file
+cd $HOME