Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-28 03:19:22 +00:00
Code Issues Releases Activity

Update 1.19.4

Browse Source
This commit is contained in:
violetc
2023-03-19 17:30:46 +08:00
parent 2fe291360d
commit c67a637939
48 changed files with 342 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0001-Build-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a1853f3d988820f357c11371e32d50682e60401..f01a32ccaa36a85859647c118185e2712ed6924b 100644
index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..5c2ecb57aa3395a2bb10464e85b18c3ecf77e91d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@@ -16,7 +16,7 @@ index 6a1853f3d988820f357c11371e32d50682e60401..f01a32ccaa36a85859647c118185e271
- implementation(project(":paper-mojangapi"))
+ implementation(project(":leaves-api")) // Leaves
+ // Leaves start
+ implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
+ implementation("io.papermc.paper:paper-mojangapi:1.19.4-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api")
+ }
+ // Leaves end
@@ -79,10 +79,10 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..0ac8bcb0a4b7d1da3d0e016617db7a81
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 710ca7d3a5659953f64bc6dccdd93b43300961cc..fd59a24743099e0599609bdb4d9b4578cd4c3940 100644
index e67c4a7aaa11f5c67f926f92e0a174af526c2ec3..a1513818ce64c97462000eb3cf69cd09261f9ddb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -92,10 +92,10 @@ index 710ca7d3a5659953f64bc6dccdd93b43300961cc..fd59a24743099e0599609bdb4d9b4578
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1ca7a4aa8ccd34e2aedbe3963950ba3717c558b7..173d1921a3b8fa5d61ed67a382ea35f358be578b 100644
index f9a9d2bb7b6d1bf4a0931438de4d8c7ee0757479..3e9861287cd3b6632aa6e4e1834e4afca4dad268 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@@ -256,7 +256,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -105,10 +105,10 @@ index 1ca7a4aa8ccd34e2aedbe3963950ba3717c558b7..173d1921a3b8fa5d61ed67a382ea35f3
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 190e17eb28d166aedee06e9578561ba402d1b6d2..13faf8a5ea85f4c94dba814e39a9e74b9c2e86c4 100644
index d51650d3e37eb76a0cf991e95d28a552aa567af9..b9a3d707cbe1b2a44f1401d812e1224cddd984b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -278,7 +278,7 @@ public class Main {
@@ -285,7 +285,7 @@ public class Main {
if (buildDate.before(deadline.getTime())) {
// Paper start - This is some stupid bullshit
System.err.println("*** Warning, you've not updated in a while! ***");