Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

Updated Upstream (Gale)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0010-Purpur-Server-Changes.patch
View File

@@ -766,10 +766,10 @@ index d601d287e94a59ff93b8a83a44dac02544d211df..0ff3b06a98b2f4514b2d861b92dd70fe
itemstack1.setCount(1);
entityitem = entityplayer.drop(itemstack1, false, false, false); // SPIGOT-2942: Add boolean to call event
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3fabf2cae 100644
index 06838ae0d1eb0f0976a6290d35a30297c156d6fc..bd3d04a25c09dcd039d43ec8595362007dc77012 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -95,6 +95,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -98,6 +98,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
return;
}
// Paper start - Use TerminalConsoleAppender
@@ -777,7 +777,7 @@ index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3
new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
/*
jline.console.ConsoleReader bufferedreader = reader;
@@ -219,6 +220,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -222,6 +223,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
io.papermc.paper.command.PaperCommands.registerCommands(this);
GaleCommands.registerCommands(this); // Gale - Gale commands - register commands
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
@@ -793,7 +793,7 @@ index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
@@ -270,6 +280,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -279,6 +289,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
return false;
}
@@ -824,7 +824,7 @@ index c332d533dfec69cbb9f41b4b235b1b1b0751f99d..d53def2d2e45ea7f42784888475b78b3
// CraftBukkit start
// this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up
@@ -343,6 +377,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -352,6 +386,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
if (org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
@@ -17520,7 +17520,7 @@ index c6129dc565b8f874b73e2fefcabd4be1c221fd73..07050f97621c0cb68b48bf39fb9c9067
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 03455a6cf97b8bec5c84978fdae2c5cc5d27c7ff..cc34d64ae522f69d1d4cbd0be75c50e12e9371f1 100644
index a907bfa9347a333282ceb708d720e5b9090a31e0..89bf7a3723b1dc9351beaf59777cc9ce0c42a441 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -401,6 +401,20 @@ public final class CraftServer implements Server {