testing

scripts/build.sh

@@ -20,6 +20,7 @@ if [ "$2" == "--setup" ] || [ "$3" == "--setup" ] || [ "$4" == "--setup" ]; then
 		
 		cd "$paperbasedir"
 		./paper jar 
+		$gitcmd git am --skip
 	)
 fi
 
@@ -37,6 +38,7 @@ echo "[Akarin] Ready to build"
 		rm -rf Paper-API/src
 		rm -rf Paper-Server/src
 		./paper patch
+		$gitcmd git am --skip
 		\cp -rf "$basedir/sources/src" "$paperbasedir/Paper-Server/"
 		\cp -rf "$basedir/sources/pom.xml" "$paperbasedir/Paper-Server/"
 		mvn clean install