mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
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:
@@ -1,8 +1,8 @@
|
||||
group = org.purpurmc.purpur
|
||||
version = 1.21.6-R0.1-SNAPSHOT
|
||||
|
||||
mcVersion = 1.21.6-pre3
|
||||
paperCommit = 6101c8af5bac6ba2b8ed6c50cf4d219ce3d07352
|
||||
mcVersion = 1.21.6-pre4
|
||||
paperCommit = 569c3231fb742fdd79af1d115398c1efae48bd90
|
||||
|
||||
org.gradle.configuration-cache = true
|
||||
org.gradle.caching = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -4290,6 +_,86 @@
|
||||
@@ -4308,6 +_,86 @@
|
||||
@Nullable
|
||||
public DragonBattle getEnderDragonBattle();
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/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[] {})
|
||||
.describedAs("Jar file");
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
acceptsAll(asList("server-name"), "Name of the server")
|
||||
.withRequiredArg()
|
||||
.ofType(String.class)
|
||||
@@ -224,7 +_,7 @@
|
||||
@@ -223,7 +_,7 @@
|
||||
System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user