Feature flags can be 32-bit.

markdwags · Sep 12, 2021 · bbe92e8 · bbe92e8
1 parent eedfc5b
commit bbe92e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Razor/Core/Player.cs b/Razor/Core/Player.cs
@@ -306,7 +306,7 @@ public int MultiVisRange
         private int m_Tithe;
         private sbyte m_LocalLight;
         private byte m_GlobalLight;
-        private ushort m_Features;
+        private uint m_Features;
         private byte m_Season;
         private byte m_DefaultSeason;
         private int[] m_MapPatches = new int[10];
@@ -447,7 +447,7 @@ public PlayerData(BinaryReader reader, int version) : base(reader, version)
 
             m_LocalLight = reader.ReadSByte();
             m_GlobalLight = reader.ReadByte();
-            m_Features = reader.ReadUInt16();
+            m_Features = reader.ReadUInt32();
             m_Season = reader.ReadByte();
 
             if (version >= 4)
@@ -1073,7 +1073,7 @@ protected override void OnTick()
             }
         }
 
-        public ushort Features
+        public uint Features
         {
             get { return m_Features; }
             set { m_Features = value; }

diff --git a/Razor/Network/Handlers.cs b/Razor/Network/Handlers.cs
@@ -2719,8 +2719,13 @@ private static void ServerAddress(Packet p, PacketHandlerEventArgs args)
 
         private static void Features(PacketReader p, PacketHandlerEventArgs args)
         {
-            if (World.Player != null)
-                World.Player.Features = p.ReadUInt16();
+            if (World.Player != null)
+            {
+                if (p.Length > 3)
+                    World.Player.Features = p.ReadUInt32();
+                else
+                    World.Player.Features = p.ReadUInt16();
+            }
         }
 
         private static void PersonalLight(PacketReader p, PacketHandlerEventArgs args)