diff --git a/Distribution/Configuration/modernuo.json b/Distribution/Configuration/modernuo.json index e2d1d13af..c78546d93 100644 --- a/Distribution/Configuration/modernuo.json +++ b/Distribution/Configuration/modernuo.json @@ -104,6 +104,7 @@ "world.enableAutoRestart": "False", "world.savePath": "Saves", "world.useMultithreadedSaves": "True", - "opl.enable": "Core.AOS" + "opl.enable": "Core.AOS", + "factions.enabled": "False" } } diff --git a/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs b/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs index d1da9557b..aa0c70915 100644 --- a/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs +++ b/Projects/UOContent/Engines/Factions/Core/FactionSystem.cs @@ -11,6 +11,9 @@ public class FactionSystem : GenericPersistence { Enabled = ServerConfiguration.GetSetting("factions.enabled", false); + if (!FactionSystem.Enabled) + return; + if (Enabled) { _factionSystem = new(); diff --git a/Projects/UOContent/Engines/Factions/Core/StrongholdRegion.cs b/Projects/UOContent/Engines/Factions/Core/StrongholdRegion.cs index 51049811f..353b9bf10 100644 --- a/Projects/UOContent/Engines/Factions/Core/StrongholdRegion.cs +++ b/Projects/UOContent/Engines/Factions/Core/StrongholdRegion.cs @@ -15,7 +15,10 @@ public class StrongholdRegion : BaseRegion Faction = faction; GoLocation = faction.Definition.Stronghold.FactionStone; - Register(); + if (FactionSystem.Enabled) + { + Register(); + } } public Faction Faction { get; set; } @@ -42,4 +45,4 @@ public class StrongholdRegion : BaseRegion } public override bool AllowHousing(Mobile from, Point3D p) => false; -} \ No newline at end of file +}