Skip to content

Prevent duplicate GameScope creation when other mods interfere w… #42

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

Prevent duplicate GameScope creation when other mods interfere w… #42

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
8 changes: 8 additions & 0 deletions src/Application/DependencyInjection/ModServiceConfigurator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ namespace MDIP.Application.DependencyInjection;
public static class ModServiceConfigurator
{
private static readonly HashSet<Type> _staticInjectionTargets = [];
private static bool _isGameScopeActive;
public static SimpleServiceProvider Provider { get; private set; }
public static IServiceScope CurrentScope { get; private set; }

Expand Down Expand Up @@ -58,8 +59,14 @@ public static void Build()

public static void CreateGameScope()
{
// Prevent duplicate scope creation in the same game session
// This can happen if another mod's prefix patch returns false and manually calls the original method
if (_isGameScopeActive)
return;

DisposeCurrentScope();
CurrentScope = Provider.CreateScope();
_isGameScopeActive = true;
Provider.RefreshSingletonPropertyInjections();
RefreshStaticInjections();
}
Expand All @@ -68,6 +75,7 @@ public static void DisposeCurrentScope()
{
CurrentScope?.Dispose();
CurrentScope = null;
_isGameScopeActive = false;

if (Provider == null)
return;
Expand Down