Skip to content

Temporary workaround for upstream MP bug. Will revert once it updates on steam #4519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
perkinslr wants to merge 1 commit into
base: Development
Choose a base branch
from
+10 −7
Open

Temporary workaround for upstream MP bug. Will revert once it updates on steam #4519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Source/MultiplayerCompat/MultiplayerCompat/MultiplayerCompat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,11 @@ public void SlowInit(ModContentPack content)
}
}

MP.RegisterAll();

MP.RegisterSyncWorker<CompAmmoUser>(SyncCompAmmoUser);
MP.RegisterSyncWorker<CompFireModes>(SyncCompFireMode);
MP.RegisterSyncWorker<Loadout>(SyncLoadout);
MP.RegisterSyncWorker<LoadoutSlot>(SyncLoadoutSlot);
MP.RegisterSyncWorker<ITab_Inventory>(SyncITab_Inventory, shouldConstruct: true);
global::CombatExtended.Compatibility.Multiplayer.registerCallbacks((() => MP.IsInMultiplayer),
(() => MP.IsExecutingSyncCommand),
(() => MP.IsExecutingSyncCommandIssuedBySelf),
Expand All @@ -94,7 +97,7 @@ private static bool SynchronizeField(object obj, string field, object val)
When writing, the comp should never be null.
*/
#nullable enable
[SyncWorker]
//[SyncWorker]
private static void SyncCompAmmoUser(SyncWorker sync, ref CompAmmoUser? comp)
{
if (sync.isWriting)
Expand Down Expand Up @@ -130,7 +133,7 @@ private static void SyncCompAmmoUser(SyncWorker sync, ref CompAmmoUser? comp)
}
}

[SyncWorker]
//[SyncWorker]
private static void SyncCompFireMode(SyncWorker sync, ref CompFireModes? comp)
{
if (sync.isWriting)
Expand Down Expand Up @@ -166,7 +169,7 @@ private static void SyncCompFireMode(SyncWorker sync, ref CompFireModes? comp)
}
}

[SyncWorker]
//[SyncWorker]
private static void SyncLoadout(SyncWorker sync, ref Loadout? loadout)
{
if (sync.isWriting)
Expand All @@ -180,7 +183,7 @@ private static void SyncLoadout(SyncWorker sync, ref Loadout? loadout)
}
}

[SyncWorker]
//[SyncWorker]
private static void SyncLoadoutSlot(SyncWorker sync, ref LoadoutSlot? loadoutSlot)
{
if (sync.isWriting)
Expand Down Expand Up @@ -223,7 +226,7 @@ private static void SyncLoadoutSlot(SyncWorker sync, ref LoadoutSlot? loadoutSlo

// Don't sync anything, we just want a blank instance for method calling purposes
// We only care about shouldConstruct being true
[SyncWorker(shouldConstruct = true)]
//[SyncWorker(shouldConstruct = true)]
private static void SyncITab_Inventory(SyncWorker sync, ref ITab_Inventory? inventory)
{ }
}
Expand Down
Loading