From e4d4730362c9d482637efb8d71a75057a6ce0b8f Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Fri, 30 Sep 2022 00:09:10 +0200
Subject: [PATCH] In eventloop now

---
 .../velocity/VelocityEventHandler.java        | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
index 7a23b64..229a399 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
@@ -36,35 +36,6 @@ public class VelocityEventHandler {
       continuation.resume();
       return;
     }
-    phase.handleLogin(player,null,continuation);
+    player.getConnection().eventLoop().submit(() -> phase.handleLogin(player,null,continuation));
   }
-
-  /*@Subscribe
-  public void onServerLoginPluginMessageEvent(ServerLoginPluginMessageEvent event, Continuation continuation) {
-    if (!Objects.equals(event.getIdentifier().getId(), "fml:loginwrapper") || !(((ConnectedPlayer)event.getConnection().getPlayer()).getPhase() instanceof VelocityForgeClientConnectionPhase)) {
-      continuation.resume();
-      return;
-    }
-    final VelocityServerConnection serverCon = (VelocityServerConnection) event.getConnection();
-    final MinecraftConnection connection = serverCon.getConnection();
-    if (connection == null) {
-      //This should never happen.
-      continuation.resumeWithException(new NullPointerException());
-      return;
-    }
-    connection.eventLoop().submit(() -> {
-      if (event.getSequenceId() == 0) {
-        connection.setType(new ForgeFML2ConnectionType());
-        serverCon.setConnectionPhase(new VelocityForgeBackendConnectionPhase(ambassador));
-        byte[] response = ((VelocityForgeBackendConnectionPhase)serverCon.getPhase()).generateResponse(serverCon.getPlayer(), Unpooled.wrappedBuffer(event.getContents()));
-        event.setResult(ServerLoginPluginMessageEvent.ResponseResult.reply(response));
-        MinecraftSessionHandler sessionHandler = new VelocityForgeBackendHandshakeHandler(connection.getSessionHandler(),serverCon);
-        connection.setSessionHandler(sessionHandler);
-        ((ForgeFML2ClientConnectionPhase) serverCon.getPlayer().getPhase()).reset(serverCon.getPlayer(), serverCon.getPlayer().getConnection(),event.getContents());
-      } else {
-        ((ForgeFML2ClientConnectionPhase) serverCon.getPlayer().getPhase()).send(serverCon.getPlayer(), new LoginPluginMessage(event.getSequenceId(),event.getIdentifier().getId(),Unpooled.wrappedBuffer(event.getContents())));
-      }
-      continuation.resume();
-    });
-  }*/
 }