mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-23 13:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8b6f4dd Add paper-settings-directory cl argument (#7949)
This commit is contained in:
BillyGalbreath 2022-06-12 06:40:31 -05:00
parent e869e89274
commit 99b1dd738d
No known key found for this signature in database
GPG Key ID: 1968A5C4D57BB3FA
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,7 +1,7 @@
group = org.purpurmc.purpur group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT version = 1.19-R0.1-SNAPSHOT
paperCommit = ee4916df7df294c51691fc68bef1e0bfd89016d9 paperCommit = 8b6f4dd482dc5f152a433475f20055f7fbf1b182
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

4
patches/server/0003-Purpur-config-files.patch
View File

@ -152,10 +152,10 @@ index 4bfcee5f8d60a082e3e8ca39eb59ebc5f33c159e..3d2763791fb50838d85387bbe37c726d
public void restart() { public void restart() {
org.spigotmc.RestartCommand.restart(); org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 344d93f1d7f25a3f26064469e78dd698af66dc0d..e8f88084b0998649c422c6011566e334b58a0c93 100644 index fbd604602024522bdd73aa1bde6fe2ccec63e442..516d26bcff64c828d3ec1607d3b774b54ab979e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -153,6 +153,14 @@ public class Main { @@ -158,6 +158,14 @@ public class Main {
.describedAs("Jar file"); .describedAs("Jar file");
// Paper end // Paper end

4
patches/server/0027-Disable-outdated-build-check.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e8f88084b0998649c422c6011566e334b58a0c93..baf79d7a2210fc8359ca6625a6973a398c9200d4 100644 index 516d26bcff64c828d3ec1607d3b774b54ab979e3..1f3c4adf3aeb28bcb91cb6913459ea2923ad95a4 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -265,7 +265,7 @@ public class Main { @@ -270,7 +270,7 @@ public class Main {
System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
} }