Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-06 15:51:33 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-02-24 13:20:12 +08:00
parent 28da679a98
commit ecb001ceb0
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -1,7 +1,7 @@
plugins {
java
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.4.1"
id("io.papermc.paperweight.patcher") version "1.5.1"
}
repositories {

2
gradle.properties
View File

@@ -4,4 +4,4 @@ version=1.19.3-R0.1-SNAPSHOT
mcVersion=1.19.3
packageVersion=1_19_R2
org.gradle.jvmargs=-Xmx2G
paperRef=f2f9e8cc4dde8b2e754d193d553b99fa824515b1
paperRef=81d7ff6e317cee83c971baf7b10046be90a6891b

10
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 d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..97269144f53a3766e3ec646576ec06a55930a3a8 100644
index 6a1853f3d988820f357c11371e32d50682e60401..f01a32ccaa36a85859647c118185e2712ed6924b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@@ -23,7 +23,7 @@ index d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..97269144f53a3766e3ec646576ec06a5
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -55,13 +59,13 @@ tasks.jar {
@@ -56,13 +60,13 @@ tasks.jar {
manifest {
val git = Git(rootProject.layout.projectDirectory.path)
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
@@ -39,7 +39,7 @@ index d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..97269144f53a3766e3ec646576ec06a5
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -133,7 +137,7 @@ fun TaskContainer.registerRunTask(
@@ -134,7 +138,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -92,7 +92,7 @@ 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 38e347b5e9911907235f794da87f56e1f26277ae..710d5c2e651882259ac45d634177e5278d5c1aad 100644
index 1ca7a4aa8ccd34e2aedbe3963950ba3717c558b7..173d1921a3b8fa5d61ed67a382ea35f358be578b 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
@@ -105,7 +105,7 @@ index 38e347b5e9911907235f794da87f56e1f26277ae..710d5c2e651882259ac45d634177e527
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 119d9bb5e41038704654e248bf168d22af246b7f..3c0414ded3ed74b11ac8ace447f09f4b85834c31 100644
index 190e17eb28d166aedee06e9578561ba402d1b6d2..13faf8a5ea85f4c94dba814e39a9e74b9c2e86c4 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 {

12
patches/server/0004-Leaves-Server-Config-And-Command.patch
View File

@@ -31,7 +31,7 @@ index fd59a24743099e0599609bdb4d9b4578cd4c3940..cab8412d5183427b02c5f5d7b76aded8
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
Arrays.fill( recentTps, 20 );
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 51b3db0b6c2cede95b584268e035c0fb36d38094..deafca06331e19105a1e19ae11f271b05af7b982 100644
index a7e133f3495e9132a5fdae2c24f225e7b026295a..cd0f05aa0f2720d450ee1b975648e73dc22ac9a5 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -221,6 +221,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -65,10 +65,10 @@ index 3cbf801b2e5420c0e870f73788deb550e49ad54d..856055eeac058290b9b2146a11f5facc
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a2ac8a05f8767697a50fe87c9f9e5dadb0eb8fcb..a4f500464de6ee6e29cff84109357364e53de233 100644
index 173d1921a3b8fa5d61ed67a382ea35f358be578b..b3f75263ed6c2b31e63ef97896ad297790442de7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -979,6 +979,7 @@ public final class CraftServer implements Server {
@@ -962,6 +962,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -76,7 +76,7 @@ index a2ac8a05f8767697a50fe87c9f9e5dadb0eb8fcb..a4f500464de6ee6e29cff84109357364
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -994,6 +995,7 @@ public final class CraftServer implements Server {
@@ -977,6 +978,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -84,7 +84,7 @@ index a2ac8a05f8767697a50fe87c9f9e5dadb0eb8fcb..a4f500464de6ee6e29cff84109357364
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1009,6 +1011,7 @@ public final class CraftServer implements Server {
@@ -992,6 +994,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -92,7 +92,7 @@ index a2ac8a05f8767697a50fe87c9f9e5dadb0eb8fcb..a4f500464de6ee6e29cff84109357364
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2762,6 +2765,14 @@ public final class CraftServer implements Server {
@@ -2746,6 +2749,14 @@ public final class CraftServer implements Server {
{
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

20
patches/server/0045-PCA-sync-protocol.patch
View File

@@ -35,7 +35,7 @@ index b29b82faea67b025e35b990a64003b4b7c3aeffd..5cf311a6cbb3f831b7158f5464ef4987
byte[] data = new byte[packet.data.readableBytes()];
packet.data.readBytes(data);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 04885ae3016559e2f1cb6359ad8b558e19c3595a..4ea3a0ad550b95a6355d476760ec4a5db76f9b16 100644
index ea6b6536688607a42ba6d22a646ad1daa12fb32f..bb0c658a7e701ae1d8c72b14a9807822b175b4ea 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -334,6 +334,7 @@ public abstract class PlayerList {
@@ -205,10 +205,10 @@ index 41c9f074203915c31c1ae7a160ce509c13383f84..4c9e84dcd154a4306659ef41ab40127e
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
index 55006724ccec9f3de828ec18693728e9741ff65f..4391127a685fa16ce76e35f7c17b2d7056b13ea1 100644
index 0bab2693b91d5bab222c7db8bc6965ccde954003..99044c31cf703f7942a89dd57cdc65ddf3a58d75 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
@@ -328,6 +328,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
@@ -333,6 +333,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
}
@@ -289,10 +289,10 @@ index 881379681c39230a00b3a1f11cd87498984396c7..e01eb2025458cf311348c58a15308540
protected Component getDefaultName() {
return Component.translatable("container.dispenser");
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index ccad692aba2ed77259f6814d88f01b91ed9d229b..01bf32fd730000bdf3a71abe0ad9546ce3775ee7 100644
index d76603c4172aa10889949c6c2acff05fee02a13d..d24a1e3a19dccf0c672d064d44afe5c525dc696d 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -125,6 +125,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -127,6 +127,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
}
@@ -309,7 +309,7 @@ index ccad692aba2ed77259f6814d88f01b91ed9d229b..01bf32fd730000bdf3a71abe0ad9546c
@Override
protected Component getDefaultName() {
return Component.translatable("container.hopper");
@@ -165,6 +175,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -167,6 +177,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
if (flag) {
blockEntity.setCooldown(world.spigotConfig.hopperTransfer); // Spigot
setChanged(world, pos, state);
@@ -343,10 +343,10 @@ index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..25a9c38c60d183bb65b14f4d7550ab98
public int[] getSlotsForFace(Direction side) {
return ShulkerBoxBlockEntity.SLOTS;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e47509d61e 100644
index b3f75263ed6c2b31e63ef97896ad297790442de7..e1ed4bbc77d24254242c9c246bf89daa6ed3c303 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -385,6 +385,7 @@ public final class CraftServer implements Server {
@@ -387,6 +387,7 @@ public final class CraftServer implements Server {
MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
}
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -354,7 +354,7 @@ index a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e4
}
public boolean getCommandBlockOverride(String command) {
@@ -980,6 +981,13 @@ public final class CraftServer implements Server {
@@ -963,6 +964,13 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config
@@ -369,7 +369,7 @@ index a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e4
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 27d791fa3f1c78ca5e7c32fbbdb357503458b419..c44850529dbff649a79cf0ee24c40550c9ea25f1 100644
index 03f618c9ba4f4f4c8ce4f3187be7e7fed8b6f8f8..29acea996719de0e1333e51df310678a7025267a 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -386,6 +386,21 @@ public final class LeavesConfig {

8
patches/server/0046-BBOR-Protocol.patch
View File

@@ -32,7 +32,7 @@ index 5cf311a6cbb3f831b7158f5464ef49878d9d9520..09156a91883f76f22c0be90e5cc00377
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 4ea3a0ad550b95a6355d476760ec4a5db76f9b16..c93d74705bd0e3cc26674b1dad69f42adfb21439 100644
index bb0c658a7e701ae1d8c72b14a9807822b175b4ea..a902043b198a70b24fd44fbabe2252ba01269284 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -335,6 +335,7 @@ public abstract class PlayerList {
@@ -77,10 +77,10 @@ index 1bf1af06fbd6501e98def7997c487c425d6a1623..15f9978e9c1ccb7f64a5f43c564842f9
public Level getLevel() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 82b588b0736f18d265c1ab269fcbd4e47509d61e..e8492a1bbf306473116974bde751b814ded4b031 100644
index e1ed4bbc77d24254242c9c246bf89daa6ed3c303..bf1c8fb01267e86feb0053821f625686c1a2c37d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -988,6 +988,13 @@ public final class CraftServer implements Server {
@@ -971,6 +971,13 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal();
}
// Leaves end - pca
@@ -95,7 +95,7 @@ index 82b588b0736f18d265c1ab269fcbd4e47509d61e..e8492a1bbf306473116974bde751b814
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index c44850529dbff649a79cf0ee24c40550c9ea25f1..40d3fe005b8bde69753807bc0fdd0255fd705a62 100644
index 29acea996719de0e1333e51df310678a7025267a..9f7b9a56f2c55dca3c434fb858c37c061de7c279 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -401,6 +401,11 @@ public final class LeavesConfig {

10
patches/server/0049-Jade-Protocol.patch
View File

@@ -20,7 +20,7 @@ index 09156a91883f76f22c0be90e5cc0037706bb9f5a..94a9af6f7b01677609a372371c77f11e
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c93d74705bd0e3cc26674b1dad69f42adfb21439..6f991cab06ef7049fc0db02e6998d513e78b993d 100644
index a902043b198a70b24fd44fbabe2252ba01269284..0e36692732b88bd021425403c1f765149e97c263 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -336,6 +336,7 @@ public abstract class PlayerList {
@@ -45,10 +45,10 @@ index 9058f9f2e561cda9f475f33218bf7a78297de4bc..196adc124a06e7c7712e4f70fada6d50
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e8492a1bbf306473116974bde751b814ded4b031..b69f915226dd9cda4b5f24e307d89c19e739ab8b 100644
index bf1c8fb01267e86feb0053821f625686c1a2c37d..69fc3ef5cb4b30fbd1633bc67ff0491023aaa9de 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -386,6 +386,7 @@ public final class CraftServer implements Server {
@@ -388,6 +388,7 @@ public final class CraftServer implements Server {
}
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca
@@ -56,7 +56,7 @@ index e8492a1bbf306473116974bde751b814ded4b031..b69f915226dd9cda4b5f24e307d89c19
}
public boolean getCommandBlockOverride(String command) {
@@ -995,6 +996,11 @@ public final class CraftServer implements Server {
@@ -978,6 +979,11 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.BBORProtocol.loggedOutAllPlayer();
}
// Leaves end - bbor
@@ -69,7 +69,7 @@ index e8492a1bbf306473116974bde751b814ded4b031..b69f915226dd9cda4b5f24e307d89c19
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 6feda82b282b73aab1955f2c5189cda9274d5213..761846061ffe05103a62d0c22561d492a6af8780 100644
index af3da4fa3073123416cc5ef37ca4db8b102b26eb..51baa0305dda36fec8855021b56867c2c863ba79 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -420,6 +420,11 @@ public final class LeavesConfig {

8
patches/server/0057-Appleskin-Protocol.patch
View File

@@ -17,7 +17,7 @@ index 325bca7d156eac56f80a4551d21dc9875bef7ed7..ed1620016aa949e77c0b004f76a10676
MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
for (int i = 0; i < this.tickables.size(); ++i) {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index d7a21346ecfe4d7a7e4df14346659826bdbc07b1..ebf9894e216b8f30ded5134c683ad68efd9c4ccd 100644
index 56cbd8aa1157ac0d4756e1b8f97c3185d63fa9ed..f4d65a391e012aaf37988018b5136c4d385bfc50 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -340,6 +340,7 @@ public abstract class PlayerList {
@@ -37,10 +37,10 @@ index d7a21346ecfe4d7a7e4df14346659826bdbc07b1..ebf9894e216b8f30ded5134c683ad68e
ServerLevel worldserver = entityplayer.getLevel();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b69f915226dd9cda4b5f24e307d89c19e739ab8b..1febe4e731356f9470020048bf78b1eb9ab1094f 100644
index 69fc3ef5cb4b30fbd1633bc67ff0491023aaa9de..4d03f51c04af2c23705c47b3e756bfce0411b3ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1001,6 +1001,13 @@ public final class CraftServer implements Server {
@@ -984,6 +984,13 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.JadeProtocol.enableAllPlayer();
}
// Leaves end - Jade
@@ -55,7 +55,7 @@ index b69f915226dd9cda4b5f24e307d89c19e739ab8b..1febe4e731356f9470020048bf78b1eb
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 53a4ac574285af1f770deb79e90c669256d3abea..07a72eeda3d6cd8fc2aef2f34619989de2267233 100644
index 478e906cc24a83ded6fbc78bcb7efae30a99b525..25a711517d4ffdc9384c1160af1b4e9635b85f49 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -487,6 +487,11 @@ public final class LeavesConfig {

6
patches/server/0059-Leaves-Extra-Yggdrasil-Service.patch
View File

@@ -18,10 +18,10 @@ index 1459a1f99fe614d072a087cda18788cf13102645..73bfda834fa704b208a5dd9271bb397a
super(proxy);
this.environment = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index 31faf2d6492696f7d0c99a48edbc0d6f15db1209..c7a2838157d73fa613e154aabb0d0a65f672fd55 100644
index 781b72fd88149642c9fceaecfbfe7546273fb749..d175bccec9ca560592072b21414df4ae47b448eb 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -181,7 +181,7 @@ public class Main {
@@ -182,7 +182,7 @@ public class Main {
file = new File(bukkitConfiguration.getString("settings.world-container", "."));
}
// Paper end - fix SPIGOT-5824
@@ -31,7 +31,7 @@ index 31faf2d6492696f7d0c99a48edbc0d6f15db1209..c7a2838157d73fa613e154aabb0d0a65
String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 3d7db0a8955c312b69338310ccec437e3046bb9e..03ccb227cbc2077eb34185c41eae976a0885621b 100644
index 2808792b8fa1ed3b7f2c6f9b81e804a7bc1a6f59..fc4e3e0d2ec19463afceb45edcebb8beda408c3d 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;