Skip to content

Fix failed registration of SyncWorkers for MultiplayerCompat #4509

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

Closed
perkinslr wants to merge 8 commits into from
Closed

Fix failed registration of SyncWorkers for MultiplayerCompat #4509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7afd154
bump multiplayer API version
perkinslr Mar 18, 2026
cbaa90c
Use explicit templated RegisterSyncWorker
perkinslr Mar 18, 2026
1dda58a
Cleanup imports
perkinslr Mar 18, 2026
b755345
enable nullable
perkinslr Mar 18, 2026
0e7eaad
Remove SyncWorker annotations
perkinslr Mar 18, 2026
be6f858
Use nullable parameters to match MP's internel signatures
perkinslr Mar 18, 2026
ddde190
Fix warnings around nullability
perkinslr Mar 18, 2026
56b528e
Check for other names for multiplayer when enabling integration
perkinslr Mar 19, 2026
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
2 changes: 1 addition & 1 deletion Source/CombatExtended/Compatibility/Multiplayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class Multiplayer : IPatch
public bool CanInstall()
{
Log.Message("Combat Extended :: Checking Multiplayer Compat");
return ModLister.HasActiveModWithName("Multiplayer");
return ModLister.HasActiveModWithName("Multiplayer") || ModLister.GetActiveModWithIdentifier("rwmt.Multiplayer") != null || ModLister.HasActiveModWithName("Multiplayer [Continuous]");
}

public void Install()
Expand Down
2 changes: 1 addition & 1 deletion Source/MultiplayerCompat/MultiplayerCompat.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
<ItemGroup>
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.6.4543" GeneratePathProperty="true" />
<PackageReference Include="Lib.Harmony" Version="2.3.6" ExcludeAssets="runtime" />
<PackageReference Include="RimWorld.MultiplayerAPI" Version="0.4.0" />
<PackageReference Include="RimWorld.MultiplayerAPI" Version="0.6.0" />
</ItemGroup>
</Project>
26 changes: 12 additions & 14 deletions Source/MultiplayerCompat/MultiplayerCompat/MultiplayerCompat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using Multiplayer.API;
Expand Down Expand Up @@ -62,19 +61,20 @@ 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));
}
#nullable enable



[SyncWorker]
private static void SyncCompAmmoUser(SyncWorker sync, ref CompAmmoUser comp)
private static void SyncCompAmmoUser(SyncWorker sync, ref CompAmmoUser? comp)
{
if (sync.isWriting)
{
var caster = comp.parent.GetComp<CompEquippable>().PrimaryVerb.Caster;
var caster = comp?.parent.GetComp<CompEquippable>().PrimaryVerb.Caster;

// Sync the turret because in that case syncing fails, due to comp.parent.Map being null,
// which causes it to be inaccessible in MP for general syncing
Expand Down Expand Up @@ -105,12 +105,11 @@ private static void SyncCompAmmoUser(SyncWorker sync, ref CompAmmoUser comp)
}
}

[SyncWorker]
private static void SyncCompFireMode(SyncWorker sync, ref CompFireModes comp)
private static void SyncCompFireMode(SyncWorker sync, ref CompFireModes? comp)
{
if (sync.isWriting)
{
var caster = comp.Caster;
var caster = comp?.Caster;

// Sync the turret because in that case syncing fails, due to comp.parent.Map being null,
// which causes it to be inaccessible in MP for general syncing
Expand Down Expand Up @@ -141,7 +140,6 @@ private static void SyncCompFireMode(SyncWorker sync, ref CompFireModes comp)
}
}

[SyncWorker]
private static void SyncLoadout(SyncWorker sync, ref Loadout loadout)
{
if (sync.isWriting)
Expand All @@ -155,7 +153,6 @@ private static void SyncLoadout(SyncWorker sync, ref Loadout loadout)
}
}

[SyncWorker]
private static void SyncLoadoutSlot(SyncWorker sync, ref LoadoutSlot loadoutSlot)
{
if (sync.isWriting)
Expand Down Expand Up @@ -198,7 +195,8 @@ private static void SyncLoadoutSlot(SyncWorker sync, ref LoadoutSlot loadoutSlot

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

#nullable restore
Loading