mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-21 07:49:18 +00:00
Updated Upstream (Purpur)
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@5b26bab8 Updated Upstream (Paper) PurpurMC/Purpur@8734844b sigh...
This commit is contained in:
@@ -106,7 +106,7 @@
|
|||||||
@@ -177,15 +_,13 @@
|
@@ -177,15 +_,13 @@
|
||||||
val services = objects.newInstance<Services>()
|
val services = objects.newInstance<Services>()
|
||||||
|
|
||||||
tasks.withType<Javadoc> {
|
tasks.withType<Javadoc>().configureEach {
|
||||||
- //(options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
|
- //(options as StandardJavadocDocletOptions).addStringOption("-add-modules", "jdk.incubator.vector") // Purpur - our javadocs need this for pufferfish's SIMD patch
|
||||||
- (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") // Purpur - silence Paper's bajillion javadoc warnings
|
- (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") // Purpur - silence Paper's bajillion javadoc warnings
|
||||||
val options = options as StandardJavadocDocletOptions
|
val options = options as StandardJavadocDocletOptions
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
|
|||||||
version=1.21.7-R0.1-SNAPSHOT
|
version=1.21.7-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion=1.21.7
|
mcVersion=1.21.7
|
||||||
purpurRef=2d8cdd15c79fce29455eaf8bedfc203bd16ca4d7
|
purpurRef=8734844b1c6f9637a532e82ba109ddbd9cf0a1aa
|
||||||
experimental=false
|
experimental=false
|
||||||
|
|
||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ Subject: [PATCH] Skip EntityScheduler's executeTick checks if there isn't any
|
|||||||
tasks to be run
|
tasks to be run
|
||||||
|
|
||||||
Original project: https://github.com/SparklyPower/SparklyPaper
|
Original project: https://github.com/SparklyPower/SparklyPaper
|
||||||
|
Removed due to moonrise already implemented feature like this
|
||||||
|
|
||||||
diff --git a/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java b/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java
|
diff --git a/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java b/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java
|
||||||
index c03608fec96b51e1867f43d8f42e5aefb1520e46..eda35b81c36ca8ebe4f9487cb41e2b0c4cbfc686 100644
|
index c03608fec96b51e1867f43d8f42e5aefb1520e46..eda35b81c36ca8ebe4f9487cb41e2b0c4cbfc686 100644
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ Date: Sat, 1 Feb 2025 19:14:09 +0300
|
|||||||
Subject: [PATCH] Skip EntityScheduler's executeTick checks if there isn't any
|
Subject: [PATCH] Skip EntityScheduler's executeTick checks if there isn't any
|
||||||
tasks to be run
|
tasks to be run
|
||||||
|
|
||||||
|
Original project: https://github.com/SparklyPower/SparklyPaper
|
||||||
|
Removed due to moonrise already implemented feature like this
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||||
index 70b33e54d8384709b166ca57cd114632e357f24f..89f9c2c3661f1ef951d865bd8c81564ea558c1e2 100644
|
index 70b33e54d8384709b166ca57cd114632e357f24f..89f9c2c3661f1ef951d865bd8c81564ea558c1e2 100644
|
||||||
|
|||||||
Reference in New Issue
Block a user