9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00

feat: update to 1.21.10

This commit is contained in:
MC_XiaoHei
2025-10-08 10:36:40 +08:00
parent 8d6817d12f
commit c57fe207dd
28 changed files with 102 additions and 101 deletions

View File

@@ -18,10 +18,10 @@ index c0910f908ffad3bb94563836c032bb1d6d50c4ed..ecd25243b55a00d7c8a04385c2695d55
}
// Leaves end - skip bot
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 77459f5a37c4388aee5600dd3bf35682a2e70928..b37eb4e1128b4bad5690c90051cf92c38b3c1008 100644
index 269de25a3ae32510d94a24860c2a20717fd491e2..411706b947ff462f47377e8055e58e7d8e15f2f8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -305,6 +305,7 @@ public final class CraftServer implements Server {
@@ -306,6 +306,7 @@ public final class CraftServer implements Server {
public final io.papermc.paper.SparksFly spark;
private final ServerConfiguration serverConfig = new PaperServerConfiguration();
private final org.leavesmc.leaves.entity.bot.CraftBotManager botManager; // Leaves
@@ -29,7 +29,7 @@ index 77459f5a37c4388aee5600dd3bf35682a2e70928..b37eb4e1128b4bad5690c90051cf92c3
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -399,7 +400,7 @@ public final class CraftServer implements Server {
@@ -400,7 +401,7 @@ public final class CraftServer implements Server {
public CraftServer(DedicatedServer console, PlayerList playerList) {
this.console = console;
this.playerList = (DedicatedPlayerList) playerList;
@@ -38,7 +38,7 @@ index 77459f5a37c4388aee5600dd3bf35682a2e70928..b37eb4e1128b4bad5690c90051cf92c3
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -2976,4 +2977,11 @@ public final class CraftServer implements Server {
@@ -2975,4 +2976,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API