From 3cc162a2a41579a60c9ea8d08b8dec52ada4233e Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Thu, 6 Apr 2023 15:33:50 +0200
Subject: [PATCH] Unnecessary reset Vanilla <-> Vanilla

---
 build.gradle.kts                                             | 2 +-
 src/main/java/org/adde0109/ambassador/Ambassador.java        | 2 +-
 .../velocity/backend/ForgeLoginSessionHandler.java           | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b96bff3..a8ac9c0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "org.adde0109"
-version = "1.3.1-beta"
+version = "1.3.1-beta-rc3"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java
index 7399529..bf490a7 100644
--- a/src/main/java/org/adde0109/ambassador/Ambassador.java
+++ b/src/main/java/org/adde0109/ambassador/Ambassador.java
@@ -40,7 +40,7 @@ import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19;
 import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19_3;
 import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet;
 
-@Plugin(id = "ambassador", name = "Ambassador", version = "1.3.1-beta", authors = {"adde0109"})
+@Plugin(id = "ambassador", name = "Ambassador", version = "1.3.1-beta-rc3", authors = {"adde0109"})
 public class Ambassador {
 
   public ProxyServer server;
diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
index aff31ae..8f19142 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
@@ -49,9 +49,10 @@ public class ForgeLoginSessionHandler implements MinecraftSessionHandler {
     }
 
     ConnectedPlayer player = serverConnection.getPlayer();
-    if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType) && player.getConnectedServer() != null) {
+    if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType) && player.getConnectedServer() != null &&
+            player.getConnectedServer().getConnection().getType() instanceof  ForgeFMLConnectionType) {
       player.getPhase().resetConnectionPhase(player);
-    } else {
+    } else if (player.getConnectedServer() == null) {
       MinecraftConnection connection = player.getConnection();
       ((OutboundSuccessHolder) connection.getChannel().pipeline().get(ForgeConstants.SERVER_SUCCESS_LISTENER))
               .sendPacket();