Simplify access to ServerAddress

sliekens · Sep 16, 2023 · 417d80a · 417d80a
1 parent a7a1f1b
commit 417d80a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/GW2SDK.Tests/Features/Mumble/GameLinkTest.cs b/GW2SDK.Tests/Features/Mumble/GameLinkTest.cs
@@ -53,12 +53,9 @@ public void The_link_provides_context()
         var gameTick = sut.GetSnapshot();
         Assert.True(gameTick.Context.BuildId > 100_000, "Game build should be over 100,000");
 
-        var server = gameTick.Context.GetServerAddress();
+        var server = gameTick.Context.ServerAddress;
         Assert.NotEmpty(server.ToString());
 
-        var address = gameTick.Context.GetServerAddress();
-        Assert.NotNull(address.Address);
-
         // Port is not specified
         Assert.Equal(0, server.Port);
     }

diff --git a/GW2SDK/Features/Mumble/Context.cs b/GW2SDK/Features/Mumble/Context.cs
@@ -8,10 +8,10 @@ namespace GuildWars2.Mumble;
 
 [PublicAPI]
 [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)]
-public struct Context
+public record struct Context
 {
     [FieldOffset(0)]
-    internal readonly sockaddr_in ServerAddress;
+    internal readonly sockaddr_in serverAddress;
 
     [FieldOffset(28)]
     public readonly uint MapId;
@@ -63,9 +63,8 @@ public struct Context
 
     public bool IsMounted => MountIndex != 0;
 
-    [Pure]
-    public IPEndPoint GetServerAddress() =>
-        new(ServerAddress.sin_addr.s_un.s_addr, ServerAddress.sin_port);
+    public readonly IPEndPoint ServerAddress =>
+        new(serverAddress.sin_addr.s_un.s_addr, serverAddress.sin_port);
 
     [Pure]
     public MountName GetMount() =>