From 6870db6137db748d22bdc98332a12d2e95863781 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Tue, 16 Mar 2021 19:41:20 +0100
Subject: [PATCH] script & POM fix
---
Spigot-Server-Patches/0001-POM-Changes.patch | 9 +++------
scripts/importmcdev.sh | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
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
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version>
<bt.name>git</bt.name>
-@@ -20,23 +19,29 @@
+@@ -20,21 +19,27 @@
</properties>
<parent>
@@ -59,11 +59,8 @@ index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783
+ <dependency>
+ <groupId>io.papermc</groupId>
<artifactId>minecraft-server</artifactId>
-- <version>${minecraft.version}-SNAPSHOT</version>
-+ <version>${minecraft.version}-R0.2-SNAPSHOT</version>
+ <version>${minecraft.version}-SNAPSHOT</version>
<scope>compile</scope>
- </dependency>
- <dependency>
@@ -64,6 +69,17 @@
<version>9.0</version>
<scope>compile</scope>
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