Skip to content

Fix gamerules accessing #314

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

Merged
skuzzis merged 1 commit into from
May 9, 2026
+10 −17
Merged

Fix gamerules accessing #314

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
27 changes: 10 additions & 17 deletions managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,25 +66,18 @@ public CHandle<T> GetRefEHandle<T>( T entity ) where T : class, ISchemaClass<T>
public CCSGameRules? GetGameRules()
{
ThrowIfEntitySystemInvalid();
if (cachedGameRules != null)
if (cachedGameRules != null && cachedGameRulesProxy != null && cachedGameRulesProxy.IsValidEntity)
{
if (cachedGameRulesProxy != null && cachedGameRulesProxy.IsValidEntity)
{
return cachedGameRules;
} else
{
cachedGameRules = null;
cachedGameRulesProxy = null;
return null;
}
} else
return cachedGameRules;
}
cachedGameRules = null;
cachedGameRulesProxy = null;

if (GetAllEntitiesByClass<CCSGameRulesProxy>().FirstOrDefault() is CCSGameRulesProxy proxy)
{
if (GetAllEntitiesByClass<CCSGameRulesProxy>().FirstOrDefault() is CCSGameRulesProxy proxy)
{
cachedGameRulesProxy = proxy;
cachedGameRules = cachedGameRulesProxy.GameRules;
return cachedGameRules;
}
cachedGameRulesProxy = proxy;
cachedGameRules = cachedGameRulesProxy.GameRules;
return cachedGameRules;
}
return null;
}
Expand Down
Loading