R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Event handler handles PostLoginEvent instead of LoginEvent

Browse Source 
In order to suppress setState(PLAY)
This commit is contained in:
Adrian Bergqvist 2023-10-12 22:26:41 +02:00
parent 594aa4ccea
commit 28ebcd76fa
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java
View File

@ -76,8 +76,6 @@ public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhas
} }
} }
message.retain(); message.retain();
// dirty hack for 1.20.2 velocity!
player.getConnection().setState(StateRegistry.LOGIN);
player.getConnection().write(message); player.getConnection().write(message);
//Forge server //Forge server
//To avoid unnecessary resets, we wait until we get the handshake even if we know that we should //To avoid unnecessary resets, we wait until we get the handshake even if we know that we should

14
src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
View File

@ -28,10 +28,12 @@ public class VelocityEventHandler {
this.ambassador = ambassador; this.ambassador = ambassador;
} }
@Subscribe @Subscribe(order = PostOrder.FIRST)
public void onLoginEvent(LoginEvent event, Continuation continuation) { public void onPostLoginEvent(PostLoginEvent event, Continuation continuation) {
ConnectedPlayer player = (ConnectedPlayer) event.getPlayer(); ConnectedPlayer player = (ConnectedPlayer) event.getPlayer();
if (player.getPhase() instanceof VelocityForgeClientConnectionPhase) { if (player.getPhase() instanceof VelocityForgeClientConnectionPhase) {
((VelocityServer) Ambassador.getInstance().server).unregisterConnection(player);
player.getConnection().eventLoop().submit(() -> { player.getConnection().eventLoop().submit(() -> {
player.getConnection().setState(StateRegistry.LOGIN); player.getConnection().setState(StateRegistry.LOGIN);
@ -43,14 +45,6 @@ public class VelocityEventHandler {
ForgeConstants.FORGE_HANDSHAKE_HANDLER, new ForgeLoginWrapperHandler(player)); ForgeConstants.FORGE_HANDSHAKE_HANDLER, new ForgeLoginWrapperHandler(player));
}); });
} }
//event.getPlayer().sendMessage(Component.text("login event"));
continuation.resume();
}
@Subscribe(order = PostOrder.FIRST)
public void onPostLoginEvent(PostLoginEvent event, Continuation continuation) {
if (((ConnectedPlayer) event.getPlayer()).getPhase() instanceof VelocityForgeClientConnectionPhase)
((VelocityServer) Ambassador.getInstance().server).unregisterConnection((ConnectedPlayer) event.getPlayer());
//event.getPlayer().sendMessage(Component.text("post login event")); //event.getPlayer().sendMessage(Component.text("post login event"));
continuation.resume(); continuation.resume();
} }