Set defaults for server player data

Extremelyd1 · Dec 25, 2023 · 074caf3 · 074caf3
1 parent 318eabb
commit 074caf3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/HKMP/Game/Server/ServerManager.cs b/HKMP/Game/Server/ServerManager.cs
@@ -240,10 +240,12 @@ private void OnHelloServer(ushort id, HelloServer helloServer) {
             return;
         }
 
-        playerData.CurrentScene = helloServer.SceneName;
+        // Specifically set the position, scale and animation before current scene so that when we check if current
+        // scene exists, we have all other data set
         playerData.Position = helloServer.Position;
         playerData.Scale = helloServer.Scale;
         playerData.AnimationId = helloServer.AnimationClipId;
+        playerData.CurrentScene = helloServer.SceneName;
 
         var clientInfo = new List<(ushort, string)>();
 

diff --git a/HKMP/Game/Server/ServerPlayerData.cs b/HKMP/Game/Server/ServerPlayerData.cs
@@ -25,7 +25,7 @@ internal class ServerPlayerData : IServerPlayer {
     public string CurrentScene { get; set; }
 
     /// <inheritdoc />
-    public Vector2 Position { get; set; }
+    public Vector2 Position { get; set; } = Vector2.Zero;
 
     /// <inheritdoc />
     public bool Scale { get; set; }
@@ -34,7 +34,7 @@ internal class ServerPlayerData : IServerPlayer {
     public bool HasMapIcon { get; set; }
 
     /// <inheritdoc />
-    public Vector2 MapPosition { get; set; }
+    public Vector2 MapPosition { get; set; } = Vector2.Zero;
 
     /// <inheritdoc />
     public ushort AnimationId { get; set; }