Skip to content

Fix SyncAction causing mods to load resources too early #526

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
SokyranTheDragon wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix SyncAction causing mods to load resources too early #526

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
14 changes: 12 additions & 2 deletions Source/Client/Syncing/Handler/SyncAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,18 @@ public void PatchAll(string methodName)

postfix.priority = MpPriority.MpLast;

Multiplayer.harmony.PatchMeasure(method, prefix, postfix);
SyncActions.syncActions[method] = this;
// Types with StaticConstructorOnStartup may be loading resources, which causes issues with
// modded types. I assume that vanilla types end up loading their resources at some point earlier.
if (method.DeclaringType?.Assembly != typeof(Game).Assembly && method.DeclaringType.HasAttribute<StaticConstructorOnStartup>())
LongEventHandler.ExecuteWhenFinished(Patch);
else
Patch();

void Patch()
{
Multiplayer.harmony.PatchMeasure(method, prefix, postfix);
SyncActions.syncActions[method] = this;
}
}
}
}
Expand Down
Loading