Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-27 02:49:10 +00:00
Code Issues Releases Activity

Update 1.18.2

Browse Source
This commit is contained in:
violetc
2022-03-05 13:09:53 +08:00
parent 4b0c53ad3d
commit 36c527e841
9 changed files with 57 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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 4662952bd0a389fe77e00ede9ab4a57f33522794..db83976d235386882ee9d8e024302e8a254ee0e2 100644
index 4beb35d1e5b013395f5df101e843f41c2ce174ad..19e73e560e9aedcb1b5cd62a45d8477cb49e5f57 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,12 @@ repositories {
@@ -71,10 +71,10 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..6105f3bdc6e698b07181b10aec588225
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 c847a2b935130a293d9ac4c196c9cff27470649b..09263e49f520a9a8984ba941fe50e70190d1242a 100644
index 07c382f30ed3736ed15b5b71f48dc4a1de958242..164ed3eeae7c074cbf906cd693734e8f4edc8be4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1719,7 +1719,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -84,10 +84,10 @@ index c847a2b935130a293d9ac4c196c9cff27470649b..09263e49f520a9a8984ba941fe50e701
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 51f67a2944034552d57b939ef29e0249e74383b9..db4e750ecff0626a52bac2d68fe26f180af29da9 100644
index 7343bd96a4a15f4abc081e565175db8df930a470..25b9d4ccedb9df8b5134a15aa81ccf391db6b8da 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -97,7 +97,7 @@ index 51f67a2944034552d57b939ef29e0249e74383b9..db4e750ecff0626a52bac2d68fe26f18
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 f810bebfca3932c80e20646eb0680f7718506707..840bd9cbbd57ad6c76e5cc8cf27318f543ceffaa 100644
index afcc80d1f79d1743b0940c69858eacec88fec889..34c2ca3571438d84c13fd5a4562ee49ecceb95cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -269,7 +269,7 @@ public class Main {