diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index c5c38f1e03..bc114ceb5f 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783ca123564 100644 +index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982ac53ee67 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -28,7 +28,7 @@ index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783 UTF-8 unknown git -@@ -20,23 +19,29 @@ +@@ -20,21 +19,27 @@ @@ -59,11 +59,8 @@ index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783 + + io.papermc minecraft-server -- ${minecraft.version}-SNAPSHOT -+ ${minecraft.version}-R0.2-SNAPSHOT + ${minecraft.version}-SNAPSHOT compile - - @@ -64,6 +69,17 @@ 9.0 compile diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index 94de2cdb2e..51bc3a24fd 100755 --- a/scripts/importmcdev.sh +++ b/scripts/importmcdev.sh @@ -63,7 +63,7 @@ function importLibrary { files=$(cat "$basedir/Spigot-Server-Patches/"* | grep "+++ b/src/main/java/net/minecraft/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\///g') -nonnms=$(grep -R "new file mode" -B 1 "$basedir/Spigot-Server-Patches/" | grep -v "new file mode" | grep -oE --color=none "net\/minecraft\/*\/.*.java" | sed 's/.*\/net\/minecraft\///g') +nonnms=$(grep -R "new file mode" -B 1 "$basedir/Spigot-Server-Patches/" | grep -v "new file mode" | grep -oE --color=none "net\/minecraft\/.*.java" | sed 's/.*\/net\/minecraft\///g') function containsElement { local e for e in "${@:2}"; do