2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
30 lines
920 B
Diff
30 lines
920 B
Diff
From ff164a0952e13e8f262ae0c687f1360c05a8ded7 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 29 Feb 2016 20:26:39 -0600
|
|
Subject: [PATCH] Fix ServerListPingEvent flagging as Async
|
|
|
|
This event can sometimes fire Async, set the proper boolean
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java
|
|
index 46b119017..05167fb34 100644
|
|
--- a/src/main/java/org/bukkit/event/server/ServerEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/server/ServerEvent.java
|
|
@@ -1,5 +1,6 @@
|
|
package org.bukkit.event.server;
|
|
|
|
+import org.bukkit.Bukkit;
|
|
import org.bukkit.event.Event;
|
|
|
|
/**
|
|
@@ -8,7 +9,7 @@ import org.bukkit.event.Event;
|
|
public abstract class ServerEvent extends Event {
|
|
|
|
public ServerEvent() {
|
|
- super();
|
|
+ super(!Bukkit.isPrimaryThread()); // Paper
|
|
}
|
|
|
|
public ServerEvent(boolean isAsync) {
|
|
--
|
|
2.21.0
|
|
|