Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01: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@7e68259c attribute modifier display
PaperMC/Paper@8d5be7ed port some generator fixes
PaperMC/Paper@569c3231 update to pre4
This commit is contained in:
granny
2025-06-10 17:11:18 -07:00
parent da6087c5d2
commit 5cd1961a65
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -1,8 +1,8 @@
group = org.purpurmc.purpur group = org.purpurmc.purpur
version = 1.21.6-R0.1-SNAPSHOT version = 1.21.6-R0.1-SNAPSHOT
mcVersion = 1.21.6-pre3 mcVersion = 1.21.6-pre4
paperCommit = 6101c8af5bac6ba2b8ed6c50cf4d219ce3d07352 paperCommit = 569c3231fb742fdd79af1d115398c1efae48bd90
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

2
purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -4290,6 +_,86 @@ @@ -4308,6 +_,86 @@
@Nullable @Nullable
public DragonBattle getEnderDragonBattle(); public DragonBattle getEnderDragonBattle();

4
purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch
View File

@@ -1,6 +1,6 @@
--- 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
@@ -165,6 +_,14 @@ @@ -164,6 +_,14 @@
.defaultsTo(new File[] {}) .defaultsTo(new File[] {})
.describedAs("Jar file"); .describedAs("Jar file");
@@ -15,7 +15,7 @@
acceptsAll(asList("server-name"), "Name of the server") acceptsAll(asList("server-name"), "Name of the server")
.withRequiredArg() .withRequiredArg()
.ofType(String.class) .ofType(String.class)
@@ -224,7 +_,7 @@ @@ -223,7 +_,7 @@
System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
} }