#W# Merge: Merged with upstream. Conflicts resolved.

This commit is contained in:
WarrentyExpired 2026-10-27 19:56:03 -04:00
commit f6f50470a9
276 changed files with 6742 additions and 8845 deletions

View file

@ -13,7 +13,7 @@ namespace Server.Misc
private static bool Enabled;
private static bool SaveBackup;
private static bool RestartServer; // Disable this if using a daemon/service
private static bool RestartServer; // Under a daemon/service, set server.restartExitCode rather than disabling this
private static bool GenerateReport;
public static void Configure()

View file

@ -736,7 +736,7 @@ namespace Server.Items
/// </summary>
public static CraftResource GetFromType(Type resourceType)
{
if (m_TypeTable == null)
if (resourceType == null || m_TypeTable == null)
{
return CraftResource.None;
}

View file

@ -262,6 +262,11 @@ namespace Server.Misc
private static void SendKarmaMessage(Mobile m, int offset)
{
if (offset == 0)
{
return;
}
var message = offset switch
{
> 40 => 1019062, // You have gained a lot of karma.