Fixed Rpc packets, these do not do a conversion to ulong but rather s…

…end the data as long
BeatTogether · Dec 20, 2023 · 1a032a1 · 1a032a1
1 parent ab08e83
commit 1a032a1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/BeatTogether.DedicatedServer.Messaging/Abstractions/BaseRpcWithValuesPacket.cs b/BeatTogether.DedicatedServer.Messaging/Abstractions/BaseRpcWithValuesPacket.cs
@@ -2,6 +2,7 @@
 
 namespace BeatTogether.DedicatedServer.Messaging.Abstractions
 {
+    // WARNING do not cast to ulong for any packets that inherit this class
     public abstract class BaseRpcWithValuesPacket : BaseRpcPacket
     {
         public byte HasValues { get; set; } = (1 | 2 | 4 | 8);

diff --git a/...edicatedServer.Messaging/Packets/MultiplayerSession/GameplayRpc/SetSongStartTimePacket.cs b/...edicatedServer.Messaging/Packets/MultiplayerSession/GameplayRpc/SetSongStartTimePacket.cs
@@ -12,13 +12,13 @@ public override void ReadFrom(ref SpanBuffer reader)
         {
             base.ReadFrom(ref reader);
             if (HasValue0)
-                StartTime = (long)reader.ReadVarULong();
+                StartTime = reader.ReadVarLong();
         }
 
         public override void WriteTo(ref SpanBuffer writer)
         {
             base.WriteTo(ref writer);
-            writer.WriteVarULong((ulong)StartTime);
+            writer.WriteVarLong(StartTime);
         }
     }
 }
diff --git a/...DedicatedServer.Messaging/Packets/MultiplayerSession/MenuRpc/SetCountdownEndTimePacket.cs b/...DedicatedServer.Messaging/Packets/MultiplayerSession/MenuRpc/SetCountdownEndTimePacket.cs
@@ -12,13 +12,13 @@ public override void ReadFrom(ref SpanBuffer reader)
         {
 			base.ReadFrom(ref reader);
 			if (HasValue0)
-				CountdownTime = (long)reader.ReadVarULong();
+				CountdownTime = reader.ReadVarLong();
 		}
 
 		public override void WriteTo(ref SpanBuffer writer)
         {
 			base.WriteTo(ref writer);
-			writer.WriteVarULong((ulong)CountdownTime);
+			writer.WriteVarLong(CountdownTime);
 		}
 	}
 }
diff --git a/...er.DedicatedServer.Messaging/Packets/MultiplayerSession/MenuRpc/SetStartGameTimePacket.cs b/...er.DedicatedServer.Messaging/Packets/MultiplayerSession/MenuRpc/SetStartGameTimePacket.cs
@@ -12,13 +12,13 @@ public override void ReadFrom(ref SpanBuffer reader)
         {
 			base.ReadFrom(ref reader);
 			if (HasValue0)
-				StartTime = (long)reader.ReadVarULong();
+				StartTime = reader.ReadVarLong();
 		}
 
 		public override void WriteTo(ref SpanBuffer writer)
         {
 			base.WriteTo(ref writer);
-			writer.WriteVarULong((ulong)StartTime);
+			writer.WriteVarLong(StartTime);
 		}
 	}
 }
diff --git a/...Together.DedicatedServer.Messaging/Packets/MultiplayerSession/MenuRpc/StartLevelPacket.cs b/...Together.DedicatedServer.Messaging/Packets/MultiplayerSession/MenuRpc/StartLevelPacket.cs
@@ -19,15 +19,15 @@ public override void ReadFrom(ref SpanBuffer reader)
             if (HasValue1)
                 Modifiers.ReadFrom(ref reader);
             if (HasValue2)
-                StartTime = (long)reader.ReadVarULong();
+                StartTime = reader.ReadVarLong();
         }
 
         public override void WriteTo(ref SpanBuffer writer)
         {
             base.WriteTo(ref writer);
             Beatmap.WriteTo(ref writer);
             Modifiers.WriteTo(ref writer);
-            writer.WriteVarULong((ulong)StartTime);
+            writer.WriteVarLong(StartTime);
         }
     }
 }