script & POM fix

This commit is contained in:
Mariell Hoversholm 2021-03-16 19:41:20 +01:00
parent 2a17719272
commit 1ecd8a1ca7
2 changed files with 2 additions and 5 deletions

View file

@ -59,11 +59,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ <dependency> + <dependency>
+ <groupId>io.papermc</groupId> + <groupId>io.papermc</groupId>
<artifactId>minecraft-server</artifactId> <artifactId>minecraft-server</artifactId>
- <version>${minecraft.version}-SNAPSHOT</version> <version>${minecraft.version}-SNAPSHOT</version>
+ <version>${minecraft.version}-R0.2-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency>
<dependency>
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
<version>9.0</version> <version>9.0</version>
<scope>compile</scope> <scope>compile</scope>

View file

@ -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') 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 { function containsElement {
local e local e
for e in "${@:2}"; do for e in "${@:2}"; do