diff --git a/common/patches/larion_structs.h b/common/patches/larion_structs.h index 1afe6cb82..2f613310c 100644 --- a/common/patches/larion_structs.h +++ b/common/patches/larion_structs.h @@ -263,17 +263,15 @@ namespace Larion { /*04*/ float x; /*08*/ float z; /*12*/ signed animation : 10; - signed padding1 : 22; - /*16*/ unsigned pitch : 12; - signed padding2 : 20; - /*20*/ float delta_y; - /*24*/ float y; - /*28*/ signed delta_heading : 10; - signed padding3 : 22; - /*32*/ signed heading : 12; - signed padding4 : 20; - /*36*/ float delta_z; - /*40*/ + unsigned pitch : 12; + signed padding1 : 10; + /*16*/ float delta_y; + /*20*/ float y; + /*24*/ signed delta_heading : 10; + signed heading : 12; + signed padding2 : 10; + /*28*/ float delta_z; + /*32*/ }; struct PlayerPositionUpdateServer_Struct @@ -289,7 +287,7 @@ namespace Larion { /*02*/ uint16 spawn_id; /*04*/ uint16 vehicle_id; /*06*/ Client_Position position; - /*46*/ + /*38*/ }; struct Door_Struct diff --git a/utils/stream_parser/common/Daybreak/Connection.cs b/utils/stream_parser/common/Daybreak/Connection.cs index 98fa93b5a..f4ba7fce0 100644 --- a/utils/stream_parser/common/Daybreak/Connection.cs +++ b/utils/stream_parser/common/Daybreak/Connection.cs @@ -176,10 +176,10 @@ namespace StreamParser.Common.Daybreak case Opcode.SessionResponse: if (_connect_code == 0) { - if(data.Length != 21) - { - return; - } + //if(data.Length != 21) + //{ + // return; + //} _connect_code = BitConverter.ToUInt32(data.Slice(2, 4)); _encode_key = IPAddress.NetworkToHostOrder(BitConverter.ToInt32(data.Slice(6, 4))); diff --git a/utils/stream_parser/common/Daybreak/Parser.cs b/utils/stream_parser/common/Daybreak/Parser.cs index be5d24e96..4bf7da653 100644 --- a/utils/stream_parser/common/Daybreak/Parser.cs +++ b/utils/stream_parser/common/Daybreak/Parser.cs @@ -47,7 +47,7 @@ namespace StreamParser.Common.Daybreak private void OnPacketCapture(object sender, PacketCapture capture) { var raw = capture.GetPacket(); - if (raw.LinkLayerType == PacketDotNet.LinkLayers.Ethernet) + if (raw.LinkLayerType == PacketDotNet.LinkLayers.Ethernet || raw.LinkLayerType == PacketDotNet.LinkLayers.Null) { var packet = PacketDotNet.Packet.ParsePacket(raw.LinkLayerType, raw.Data); var ipPacket = packet.Extract();