[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
5 changed files with 18 additions and 10 deletions

View File

@@ -61,4 +61,4 @@ function savePatches {
savePatches "$workdir/Spigot/Spigot-API" "Paper-API"
savePatches "$workdir/Spigot/Spigot-Server" "Paper-Server"
)
) || exit 1