fix(clrcore-v2): Fix PR #2546 and Add Delegate Serialization Support #3409
Conversation
github-actions
bot
added
the
invalid
manups4e
changed the title
|
i see the commits have wrong naming convention 🤔 question is how do i change the names XD |
|
If you use the Git in Visual Studio (I assume other clients are similar), right click on the commit before your oldest commit, Reset -> Keep changes.
This will remove all of your commits, but will keep all of your changes in the uncommitted changes on the right. So you can can make 1 new commit with all of the changes in it and the right naming. Once you do that to overwrite your changes to github, you will need to force push. Git -> Open In Command Prompt, and type in EDIT: Apparently you can also select all of your commits and right click -> Squash commits, instead of resetting and making a new one. Still needs a force push |
| } | ||
| catch (Exception ex) | ||
| { | ||
| Debug.WriteException(ex, funcRef.m_method, args, "reference function"); | ||
| //Debug.WriteException(ex, funcRef.m_method, args, "reference function"); | ||
| Debug.WriteLine(ex); |
There was a problem hiding this comment.
This change can be reverted to WriteException again?
There was a problem hiding this comment.
yeah it should be i'll check it as soon as i get home and commit.
| @@ -25,6 +25,11 @@ public Function(MsgPackFunc method, byte[] id) | |||
|
|
|||
| private static Dictionary<int, Function> s_references = new Dictionary<int, Function>(); | |||
|
|
|||
| static ReferenceFunctionManager() | |||
| { | |||
| MsgPackReferenceRegistrar.CreateFunc = Create; | |||
There was a problem hiding this comment.
I had to manually add the new MsgPackReferenceRegistrar.cs file in CitizenFX.Core csproj, but VS didn't register that, i suspect that when the module is loaded after merge it'll be automatically added as part of the msgpack library itself
manups4e
changed the title
Co-authored-by: thorium <102315529+thorium-cfx@users.noreply.github.com>
…o allow separate module building
github-actions
bot
added
triage
github-actions
bot
added
invalid
…d encryption methods
Goal of this PR
Re-enable (De)Serialization using the new custom msgpack provided in #2546
How is this PR achieving the goal
This PR adds back all Thorium's modifications and some extras to be fully compatible with the new MsgPack (de)serialization.
Warning
This PR applies to the following area(s)
Successfully tested on
FXServer and FiveM client
Game builds: N/A
Platforms: Windows
Checklist
Fixes issues
fixes #2653, #2613, #2590, #2582, #2571,