Fixed bug introduced with a4794e3

ViaVersion · Nov 27, 2023 · 57cbb51 · 57cbb51
1 parent 7b32dd4
commit 57cbb51
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...e/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java b/...e/florianmichael/viafabricplus/injection/mixin/base/integration/MixinConnectScreen_1.java
@@ -23,6 +23,8 @@
 import de.florianmichael.viafabricplus.ViaFabricPlus;
 import de.florianmichael.viafabricplus.injection.access.IServerInfo;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
+import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
+import de.florianmichael.viafabricplus.settings.impl.AuthenticationSettings;
 import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import net.lenni0451.mcping.MCPing;
 import net.minecraft.client.gui.screen.ConnectScreen;
@@ -54,9 +56,11 @@ public abstract class MixinConnectScreen_1 {
 
     @Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/session/Session;getUsername()Ljava/lang/String;"))
     private String useClassiCubeUsername(Session instance) {
-        final var account = ViaFabricPlus.global().getSaveManager().getAccountsSave().getClassicubeAccount();
-        if (account != null) {
-            return account.username();
+        if (AuthenticationSettings.global().setSessionNameToClassiCubeNameInServerList.getValue() && ViaFabricPlusClassicMPPassProvider.classiCubeMPPass != null) {
+            final var account = ViaFabricPlus.global().getSaveManager().getAccountsSave().getClassicubeAccount();
+            if (account != null) {
+                return account.username();
+            }
         }
 
         return instance.getUsername();