warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes extension method refactors causing crash (#1529)

Browse source
This commit is contained in:
Kamron Batman 2023-10-02 22:24:16 -07:00 • committed by GitHub
parent f2de2fbb77
commit e18115dd94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Projects/UOContent/Engines/CannedEvil/ChampionTitleSystem.cs
View file

@ -65,8 +65,16 @@ public class ChampionTitleSystem : GenericPersistence
}
}
public static bool GetChampionTitleContext(PlayerMobile player, out ChampionTitleContext context) =>
_championTitleContexts.TryGetValue(player, out context);
public static bool GetChampionTitleContext(PlayerMobile player, out ChampionTitleContext context)
{
if (player != null && _championTitleContexts.TryGetValue(player, out context))
{
return true;
}
context = null;
return false;
}
public static ChampionTitleContext GetOrCreateChampionTitleContext(PlayerMobile player)
{

17
Projects/UOContent/Engines/Player Murder System/PlayerMurderSystem.cs
View file

@ -132,11 +132,24 @@ public class PlayerMurderSystem : GenericPersistence
}
}
public static bool GetMurderContext(PlayerMobile player, out MurderContext context) =>
_murderContexts.TryGetValue(player, out context);
public static bool GetMurderContext(PlayerMobile player, out MurderContext context)
{
if (player != null && _murderContexts.TryGetValue(player, out context))
{
return true;
}
context = null;
return false;
}
public static MurderContext GetOrCreateMurderContext(PlayerMobile player)
{
if (player == null)
{
return null;
}
ref var context = ref CollectionsMarshal.GetValueRefOrAddDefault(_murderContexts, player, out var exists);
if (!exists)
{

7
Projects/UOContent/Engines/Virtues/VirtueSystem.cs
View file

@ -106,10 +106,15 @@ public class VirtueSystem : GenericPersistence
}
public static VirtueContext GetVirtues(PlayerMobile from) =>
_playerVirtues.TryGetValue(from, out var context) ? context : null;
from != null && _playerVirtues.TryGetValue(from, out var context) ? context : null;
public static VirtueContext GetOrCreateVirtues(PlayerMobile from)
{
if (from == null)
{
return null;
}
ref VirtueContext context = ref CollectionsMarshal.GetValueRefOrAddDefault(_playerVirtues, from, out bool exists);
if (!exists)
{