From 1ecd8a1ca7ede121990b3512b2c990709d7aa6c3 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/POM-Changes.patch | 5 +----
 scripts/importmcdev.sh                  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index c8c5b16b20..a9f227f4ed 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -59,11 +59,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        <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>
 @@ -0,0 +0,0 @@
              <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