Fix SetBits not overwriting bits properly

Closes #123
RiptideNetworking · Dec 3, 2023 · 713d7b4 · 713d7b4
1 parent 948e184
commit 713d7b4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/RiptideNetworking/RiptideNetworking/Utils/Converter.cs b/RiptideNetworking/RiptideNetworking/Utils/Converter.cs
@@ -170,12 +170,11 @@ public static void SetBits(ulong bitfield, int amount, ulong[] array, int startB
             int bit = startBit % BitsPerULong;
             if (bit == 0)
                 array[pos] = bitfield | array[pos] & ~mask;
-            else if (bit + amount < BitsPerULong)
-                array[pos] |= bitfield << bit;
             else
             {
-                array[pos    ] = (bitfield << bit) | (array[pos] & ~(mask << bit));
-                array[pos + 1] = (bitfield >> (64 - bit)) | (array[pos + 1] & ~(mask >> (64 - bit)));
+                array[pos] = (bitfield << bit) | (array[pos] & ~(mask << bit));
+                if (bit + amount >= BitsPerULong)
+                    array[pos + 1] = (bitfield >> (64 - bit)) | (array[pos + 1] & ~(mask >> (64 - bit)));
             }
         }