diff options
| author | Aikar <[email protected]> | 2018-09-03 14:52:26 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2018-09-03 14:52:26 -0400 |
| commit | ab56ada4d2ad13aceb5aa1016a64c7c667cdc421 (patch) | |
| tree | 705e49bc5a3d24f03c3c953d693821aea70c4cc3 /scripts | |
| parent | d37d04a52fbbffbdd7f6d852992c05b0eb380648 (diff) | |
| download | Paper-ab56ada4d2ad13aceb5aa1016a64c7c667cdc421.tar.gz Paper-ab56ada4d2ad13aceb5aa1016a64c7c667cdc421.zip | |
[CI-SKIP] Fix the NMS Imports detecting our own files
the way I handled this on my fork was using the metadata in the
git "stats" output of patches, however we don't include stats in
the patch files for paper so the code didn't work.
Changed the code to detect our own file editions inside of NMS
to a method that works without stats.
So we no longer need to manually add files to this list
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/importmcdev.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index c87a9f2467..2424410639 100755 --- a/scripts/importmcdev.sh +++ b/scripts/importmcdev.sh @@ -41,13 +41,7 @@ function import { files=$(cat "$basedir/Spigot-Server-Patches/"* | grep "+++ b/src/main/java/net/minecraft/server/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g') -nonnms=$(cat "$basedir/Spigot-Server-Patches/"* | grep "create mode " | grep -Po "src/main/java/net/minecraft/server/(.*?).java" | sort | uniq | sed 's/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g' ; - # TODO: Fix non nms to work for Paper, hard code these for now - echo "KeyedObject" ; - echo "MCUtil" ; - echo "PaperLightingQueue" -) - +nonnms=$(grep "new file mode" -B 1 Spigot-Server-Patches/* | grep -v "new file mode" | grep -oE "net\/minecraft\/server\/.*.java" | grep -oE "[A-Za-z]+?.java$" --color=none | sed 's/.java//g') function containsElement { local e for e in "${@:2}"; do |