From 7ab96fcbb4f6b82cf93872b16ddfdf26c46a6c5c Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Mon, 12 Jun 2023 20:13:13 +0200
Subject: [PATCH] Do not reset when going from vanilla to vanilla

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

diff --git a/build.gradle.kts b/build.gradle.kts
index 226e88a..28af6b9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "org.adde0109"
-version = "1.4.0-beta-rc8"
+version = "1.4.0-beta-rc9"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java
index dac69ff..c595052 100644
--- a/src/main/java/org/adde0109/ambassador/Ambassador.java
+++ b/src/main/java/org/adde0109/ambassador/Ambassador.java
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
 import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19;
 import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet;
 
-@Plugin(id = "ambassador", name = "Ambassador", version = "1.4.0-beta-rc8", authors = {"adde0109"})
+@Plugin(id = "ambassador", name = "Ambassador", version = "1.4.0-beta-rc", 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 74d2dcd..ed4ee72 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
@@ -49,7 +49,8 @@ public class ForgeLoginSessionHandler implements MinecraftSessionHandler {
     }
     ConnectedPlayer player = serverConnection.getPlayer();
     if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType)) {
-      if (player.getConnection() == null || player.getConnection().getType() instanceof ForgeFMLConnectionType) {
+      if (player.getConnectedServer() == null ||
+              player.getConnectedServer().getConnection().getType() instanceof ForgeFMLConnectionType) {
         //Initial Vanilla
         //Forge -> vanilla
         player.getPhase().resetConnectionPhase(player);