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

* master:
  Properly forward exit 1 code from the paper root command
This commit is contained in:
Aikar 2018-07-30 17:40:54 -04:00
commit cae5a06b92
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
5 changed files with 18 additions and 10 deletions

View file

@ -95,4 +95,4 @@ cd "$basedir"
echo "Failed to apply Paper Patches"
exit 1
) || exit 1
)
) || exit 1