diff --git a/scripts/build.sh b/scripts/build.sh index 0c6b3b43e..13ea940d6 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -19,7 +19,8 @@ if [ "$2" == "--setup" ] || [ "$3" == "--setup" ] || [ "$4" == "--setup" ]; then fi cd "$paperbasedir" - ./paper jar + ./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 diff --git a/work/Paper b/work/Paper index 158c94c0c..44d567989 160000 --- a/work/Paper +++ b/work/Paper @@ -1 +1 @@ -Subproject commit 158c94c0ca69644a99cb07ae7b1aca9dd97801af +Subproject commit 44d567989e60c501b29678c6ff744a046bddb159