Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-28 03:19:22 +00:00
Code Issues Releases Activity

fix CraftScheduler internal plugin logging issue (#284)

Browse Source
This commit is contained in:
Lumine1909
2024-07-30 00:46:31 +08:00
committed by GitHub
parent a1fb5ff7fc
commit a8897bd15c
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/server/0010-Fakeplayer-support.patch
View File

@@ -497,7 +497,7 @@ index 0ab53d46f0b8f3f3791dd01766738522c86932e8..f60301047fc22fb72413fe95eb89e4d2
if (event.isCancelled()) {
return event;
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 22f1ed383313829b8af4badda9ef8dc85cae8fd1..03af280bffbd2070abaf1de4b0c963899a67854c 100644
index 22f1ed383313829b8af4badda9ef8dc85cae8fd1..1c47e320e464af9651953ff308a2583fcb965891 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -1,7 +1,7 @@
@@ -534,6 +534,25 @@ index 22f1ed383313829b8af4badda9ef8dc85cae8fd1..03af280bffbd2070abaf1de4b0c96389
/**
* The start ID for the counter.
*/
@@ -478,10 +480,14 @@ public class CraftScheduler implements BukkitScheduler {
"Task #%s for %s generated an exception",
task.getTaskId(),
task.getOwner().getDescription().getFullName());
- task.getOwner().getLogger().log(
- Level.WARNING,
- logMessage,
- throwable);
+ if (task.getOwner() instanceof MinecraftInternalPlugin) {
+ net.minecraft.server.MinecraftServer.LOGGER.error(logMessage, throwable);
+ } else {
+ task.getOwner().getLogger().log(
+ Level.WARNING,
+ logMessage,
+ throwable);
+ }
org.bukkit.Bukkit.getServer().getPluginManager().callEvent(
new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerSchedulerException(logMessage, throwable, task)));
// Paper end
diff --git a/src/main/java/org/leavesmc/leaves/bot/BotCommand.java b/src/main/java/org/leavesmc/leaves/bot/BotCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..b64361c4151659d5e3f8884562cb811d60776c38