mirror of
https://github.com/colbster937/originblacklist.git
synced 2026-02-04 11:07:41 +00:00
Compare commits
3 Commits
v2.0.7
...
v2.0.7+ebc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebcae682aa | ||
|
|
f22e800439 | ||
|
|
f0274ff4d4 |
@@ -80,7 +80,9 @@ public final class OriginBlacklist {
|
|||||||
|
|
||||||
public final void shutdown() {
|
public final void shutdown() {
|
||||||
this.plugin.log(EnumLogLevel.INFO, "Shutting down...");
|
this.plugin.log(EnumLogLevel.INFO, "Shutting down...");
|
||||||
|
if (this.isBlacklistAPIEnabled()) {
|
||||||
OriginBlacklistRequestHandler.unRegister(this);
|
OriginBlacklistRequestHandler.unRegister(this);
|
||||||
|
}
|
||||||
this.plugin.shutdown();
|
this.plugin.shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -319,6 +321,7 @@ public final class OriginBlacklist {
|
|||||||
try {
|
try {
|
||||||
final Json5Object obj = new Json5Object();
|
final Json5Object obj = new Json5Object();
|
||||||
obj.addProperty("plugin_version", this.plugin.getPluginVersion().getVersion());
|
obj.addProperty("plugin_version", this.plugin.getPluginVersion().getVersion());
|
||||||
|
obj.addProperty("git_commit", COMMIT_L);
|
||||||
obj.addProperty("blacklist_to_whitelist", this.config.getBoolean("blacklist_to_whitelist"));
|
obj.addProperty("blacklist_to_whitelist", this.config.getBoolean("blacklist_to_whitelist"));
|
||||||
obj.addProperty("block_undefined_origin", this.config.getBoolean("block_undefined_origin"));
|
obj.addProperty("block_undefined_origin", this.config.getBoolean("block_undefined_origin"));
|
||||||
final Json5Object bObj = new Json5Object();
|
final Json5Object bObj = new Json5Object();
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package xyz.webmc.originblacklist.base.util;
|
||||||
|
|
||||||
|
public final class EventPriority {
|
||||||
|
public static final int EAGLER_MOTD_EVENT = 100;
|
||||||
|
}
|
||||||
@@ -101,7 +101,7 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
|
|||||||
this.blacklist.handleLogin(new OriginBlacklistLoginEvent(event, null, EnumConnectionType.EAGLER, player));
|
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) {
|
public final void onEaglerMOTD(final EaglercraftMOTDEvent event) {
|
||||||
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
||||||
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
|
|||||||
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
|
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
|
||||||
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
|
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
|
||||||
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
|
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.IOriginBlacklistPlugin;
|
||||||
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
|
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
|
||||||
import xyz.webmc.originblacklist.base.util.OPlayer;
|
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));
|
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) {
|
public final void onEaglerMOTD(final EaglercraftMOTDEvent event) {
|
||||||
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
||||||
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
||||||
|
|||||||
Reference in New Issue
Block a user