mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-05 11:42:49 +02:00
17b58d00d8
This was a useless exception wrapper that ends up making stack traces harder to read as well as the JVM cutting off the important parts Nothing catches this exception, so its safe to just get rid of it and let the REAL exception bubble down
55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
From 53967b181e239d26686641531567dd5ca810eaef 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 eb00d6af..70416c81 100644
|
|
--- a/src/main/java/org/bukkit/event/server/ServerEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/server/ServerEvent.java
|
|
@@ -1,9 +1,19 @@
|
|
package org.bukkit.event.server;
|
|
|
|
+import org.bukkit.Bukkit;
|
|
import org.bukkit.event.Event;
|
|
|
|
/**
|
|
* Miscellaneous server events
|
|
*/
|
|
public abstract class ServerEvent extends Event {
|
|
+ // Paper start
|
|
+ public ServerEvent(boolean isAsync) {
|
|
+ super(isAsync);
|
|
+ }
|
|
+
|
|
+ public ServerEvent() {
|
|
+ super(!Bukkit.isPrimaryThread());
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
|
|
index 343f238f..3c38d857 100644
|
|
--- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java
|
|
@@ -21,6 +21,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
|
|
private int maxPlayers;
|
|
|
|
public ServerListPingEvent(final InetAddress address, final String motd, final int numPlayers, final int maxPlayers) {
|
|
+ super(); // Paper - Is this event being fired async?
|
|
Validate.isTrue(numPlayers >= 0, "Cannot have negative number of players online", numPlayers);
|
|
this.address = address;
|
|
this.motd = motd;
|
|
@@ -38,6 +39,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable<Player>
|
|
* @param maxPlayers the max number of players
|
|
*/
|
|
protected ServerListPingEvent(final InetAddress address, final String motd, final int maxPlayers) {
|
|
+ super(); // Paper - Is this event being fired async?
|
|
this.numPlayers = MAGIC_PLAYER_COUNT;
|
|
this.address = address;
|
|
this.motd = motd;
|
|
--
|
|
2.20.1
|
|
|