Fixup server brand fetch

OreCruncher · Feb 5, 2024 · c48fb28 · c48fb28
1 parent 24ca59d
commit c48fb28
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/main/java/org/orecruncher/dsurround/lib/GameUtils.java b/src/main/java/org/orecruncher/dsurround/lib/GameUtils.java
@@ -8,11 +8,11 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.ParticleEngine;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.entity.player.Player;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -23,7 +23,7 @@ private GameUtils() {
     }
 
     // Client methods
-    public static Optional<Player> getPlayer() {
+    public static Optional<LocalPlayer> getPlayer() {
         return Optional.ofNullable(getMC().player);
     }
 
@@ -94,10 +94,7 @@ public static Minecraft getMC() {
     }
 
     public static Optional<String> getServerBrand() {
-        var connection = getMC().getConnection();
-        if (connection != null)
-            return Optional.ofNullable(connection.serverBrand());
-        return Optional.empty();
+        return getPlayer().map(LocalPlayer::getServerBrand);
     }
 
     public static MinecraftServerType getServerType() {