[CI-SKIP] Merge branch 'master' into pre/1.13

* master: Properly forward exit 1 code from the paper root command
2018-07-30 17:40:54 -04:00
parent 5368b241ab 15735117d7
commit be0ed31821
5 changed files with 18 additions and 10 deletions
--- a/scripts/applyPatches.sh
+++ b/scripts/applyPatches.sh
@@ -95,4 +95,4 @@ cd "$basedir"
    echo "Failed to apply Paper Patches"
    exit 1
 ) || exit 1
-)
+) || exit 1