Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-18 13:31:40 +01:00
Code Issues Projects Releases Wiki Activity

fix 4878 by always calling events using bukkit singleton

Browse Source
This commit is contained in:
MiniDigger 2020-12-09 21:09:54 +01:00
parent 5d216be1d7
commit c19ec63941
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
View File

@ -239,7 +239,7 @@ index 141a8e31151010e5a0bd8d4661033f109f6a2e67..138c6d707e33cd352aa4b26dfb279c5b
} finally { } finally {
if (fileinputstream != null) { if (fileinputstream != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index ffe9cc1011226d604dc5499e7692e9a9a5132b72..343cdb06881fa8b0155b56d29c110bba489f9667 100644 index ffe9cc1011226d604dc5499e7692e9a9a5132b72..9b6d9373abb59a30c2835ca891282d07559281f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger;
@ -256,7 +256,7 @@ index ffe9cc1011226d604dc5499e7692e9a9a5132b72..343cdb06881fa8b0155b56d29c110bba
msg, msg,
throwable); throwable);
} }
+ task.getOwner().getServer().getPluginManager().callEvent( + org.bukkit.Bukkit.getServer().getPluginManager().callEvent(
+ new ServerExceptionEvent(new ServerSchedulerException(msg, throwable, task))); + new ServerExceptionEvent(new ServerSchedulerException(msg, throwable, task)));
// Paper end // Paper end
} finally { } finally {