diff --git a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PlayerSettingsListener.java b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PlayerSettingsListener.java index c78dee9e..fc5d9fa7 100644 --- a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PlayerSettingsListener.java +++ b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PlayerSettingsListener.java @@ -15,6 +15,7 @@ package me.xneox.epicguard.velocity.listener; +import com.velocitypowered.api.event.Continuation; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.player.PlayerSettingsChangedEvent; import me.xneox.epicguard.core.EpicGuard; @@ -26,7 +27,8 @@ public PlayerSettingsListener(EpicGuard epicGuard) { } @Subscribe - public void onPostLogin(PlayerSettingsChangedEvent event) { + public void onPostLogin(PlayerSettingsChangedEvent event, Continuation continuation) { this.onSettingsChanged(event.getPlayer().getUniqueId()); + continuation.resume(); } } diff --git a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PostLoginListener.java b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PostLoginListener.java index a8d96ccc..97be2fbc 100644 --- a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PostLoginListener.java +++ b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PostLoginListener.java @@ -15,6 +15,7 @@ package me.xneox.epicguard.velocity.listener; +import com.velocitypowered.api.event.EventTask; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PostLoginEvent; import me.xneox.epicguard.core.EpicGuard; @@ -26,8 +27,10 @@ public PostLoginListener(EpicGuard epicGuard) { } @Subscribe - public void onPostLogin(PostLoginEvent event) { - var player = event.getPlayer(); - this.onPostLogin(player.getUniqueId(), player.getRemoteAddress().getAddress().getHostAddress()); + public EventTask onPostLogin(PostLoginEvent event) { + return EventTask.async(() -> { + var player = event.getPlayer(); + this.onPostLogin(player.getUniqueId(), player.getRemoteAddress().getAddress().getHostAddress()); + }); } } diff --git a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PreLoginListener.java b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PreLoginListener.java index ba5c3993..df48510a 100644 --- a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PreLoginListener.java +++ b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/PreLoginListener.java @@ -29,8 +29,8 @@ public PreLoginListener(EpicGuard epicGuard) { @Subscribe(order = PostOrder.FIRST) public EventTask onPreLogin(PreLoginEvent event) { - String address = event.getConnection().getRemoteAddress().getAddress().getHostAddress(); - String nickname = event.getUsername(); + final String address = event.getConnection().getRemoteAddress().getAddress().getHostAddress(); + final String nickname = event.getUsername(); return EventTask.async(() -> this.onPreLogin(address, nickname).ifPresent(result -> event.setResult(PreLoginEvent.PreLoginComponentResult.denied(result)))); diff --git a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/ServerPingListener.java b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/ServerPingListener.java index 9c119f4d..f37954b4 100644 --- a/velocity/src/main/java/me/xneox/epicguard/velocity/listener/ServerPingListener.java +++ b/velocity/src/main/java/me/xneox/epicguard/velocity/listener/ServerPingListener.java @@ -15,6 +15,7 @@ package me.xneox.epicguard.velocity.listener; +import com.velocitypowered.api.event.EventTask; import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.proxy.ProxyPingEvent; @@ -27,7 +28,8 @@ public ServerPingListener(EpicGuard epicGuard) { } @Subscribe(order = PostOrder.FIRST) - public void onPing(ProxyPingEvent event) { - this.onPing(event.getConnection().getRemoteAddress().getAddress().getHostAddress()); + public EventTask onPing(ProxyPingEvent event) { + return EventTask.async(() -> + this.onPing(event.getConnection().getRemoteAddress().getAddress().getHostAddress())); } }