Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 05:55:44 +01:00
Code Issues Projects Releases Wiki Activity

script & POM fix

Browse Source
This commit is contained in:
Mariell Hoversholm 2021-03-16 19:41:20 +01:00
parent 743c6533c3
commit 6870db6137
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Spigot-Server-Patches/0001-POM-Changes.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783ca123564 100644 index a31f1513a90c753deba35320a6698a933bc9782f..2559c83c1b811177ade56537aeab1982ac53ee67 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
@ -28,7 +28,7 @@ index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version> <api.version>unknown</api.version>
<bt.name>git</bt.name> <bt.name>git</bt.name>
@@ -20,23 +19,29 @@ @@ -20,21 +19,27 @@
</properties> </properties>
<parent> <parent>
@ -59,11 +59,8 @@ index a31f1513a90c753deba35320a6698a933bc9782f..9b0d5a157af5e4af2884b11721217783
+ <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>
@@ -64,6 +69,17 @@ @@ -64,6 +69,17 @@
<version>9.0</version> <version>9.0</version>
<scope>compile</scope> <scope>compile</scope>

2
scripts/importmcdev.sh
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