9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-06 15:51:31 +00:00

Updated Upstream (Gale)

This commit is contained in:
Dreeam
2023-08-11 04:57:53 +08:00
parent b180368a3e
commit 0bdf061725
8 changed files with 26 additions and 27 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaf Config
diff --git a/build.gradle.kts b/build.gradle.kts
index 43a72d2fb4b6e73fa258c414eaada65ac366d1e3..add4506180ce44167584e228142bfc0b0f8d6155 100644
index 9bc4698a3d38ff3b6ae0d37a286ffc053f2d863f..d297578fe5990eb7ff55d995ec30525bf8776a52 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -58,6 +58,13 @@ dependencies {
@@ -38,18 +38,17 @@ index f749516e5d3c22e808638f3a7672aab837571b1a..61fc65624f7d9a3bfa399a58112efb7f
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 5390cdf13c462e478c9e61115c0bb3401e0eacfe..4ee7ce28263ed1cca7ee98c81404d62ae1128aeb 100644
index fcf8fe61e1c1cff550f86b83fca095a5513aa093..64bc644029dc9fa3cb802b58ecd8f197c3c4ad5b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -223,6 +223,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
@@ -232,6 +232,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
SIMDDetection.initialize();
} catch (Throwable ignored) {}
// Gale start - Pufferfish - SIMD support
+ org.dreeam.leaf.LeafConfig.load(); // Leaf
+
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..d924db6378b2c60c7b96cf5c45a6d50a091f9790