From ab56ada4d2ad13aceb5aa1016a64c7c667cdc421 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Sep 2018 14:52:26 -0400 Subject: [PATCH] [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 --- scripts/importmcdev.sh | 8 +------- 1 file changed, 1 insertion(+), 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