diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java b/src/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java new file mode 100644 index 0000000..74cabb5 --- /dev/null +++ b/src/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java @@ -0,0 +1,5 @@ +package xyz.webmc.originblacklist.base.util; + +public final class EventPriority { + public static final int EAGLER_MOTD_EVENT = 100; +} \ No newline at end of file diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java index c57a28e..f2a1982 100644 --- a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java +++ b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java @@ -101,7 +101,7 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr this.blacklist.handleLogin(new OriginBlacklistLoginEvent(event, null, EnumConnectionType.EAGLER, player)); } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler(priority = xyz.webmc.originblacklist.base.util.EventPriority.EAGLER_MOTD_EVENT) public final void onEaglerMOTD(final EaglercraftMOTDEvent event) { final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null); this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player)); diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java index d7799fa..ae21b2c 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java @@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType; import xyz.webmc.originblacklist.base.enums.EnumLogLevel; import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent; import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent; +import xyz.webmc.originblacklist.base.util.EventPriority; import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin; import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException; import xyz.webmc.originblacklist.base.util.OPlayer; @@ -117,7 +118,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin { this.blacklist.handleLogin(new OriginBlacklistLoginEvent(event, null, EnumConnectionType.EAGLER, player)); } - @Subscribe(order = PostOrder.LAST) + @Subscribe(priority = EventPriority.EAGLER_MOTD_EVENT, order = PostOrder.LAST) public final void onEaglerMOTD(final EaglercraftMOTDEvent event) { final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null); this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));