diff --git a/Dalamud.Injector/Program.cs b/Dalamud.Injector/Program.cs index 6ae51f0e4..74be801bd 100644 --- a/Dalamud.Injector/Program.cs +++ b/Dalamud.Injector/Program.cs @@ -180,7 +180,8 @@ namespace Dalamud.Injector { $"PluginDirectory: {startInfo.PluginDirectory}\n" + $"DefaultPluginDirectory: {startInfo.DefaultPluginDirectory}\n" + $"Language: {startInfo.Language}\n" + - $"GameVersion: {startInfo.GameVersion}"); + $"GameVersion: {startInfo.GameVersion}\n" + + $"OptOutMbCollection: {startInfo.OptOutMbCollection}"); return startInfo; } diff --git a/Dalamud/Configuration/DalamudConfiguration.cs b/Dalamud/Configuration/DalamudConfiguration.cs index 72949b367..890267581 100644 --- a/Dalamud/Configuration/DalamudConfiguration.cs +++ b/Dalamud/Configuration/DalamudConfiguration.cs @@ -11,8 +11,6 @@ namespace Dalamud [Serializable] internal class DalamudConfiguration { - public bool OptOutMbCollection { get; set; } = false; - public List BadWords { get; set; } public bool DutyFinderTaskbarFlash { get; set; } = true; diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index 3446ad3fa..01aa45495 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -87,7 +87,7 @@ namespace Dalamud { this.WinSock2 = new WinSockHandlers(); - NetworkHandlers = new NetworkHandlers(this, this.Configuration.OptOutMbCollection); + NetworkHandlers = new NetworkHandlers(this, info.OptOutMbCollection); this.ClientState = new ClientState(this, info, this.SigScanner); diff --git a/Dalamud/DalamudStartInfo.cs b/Dalamud/DalamudStartInfo.cs index bb5ffe83d..4e40beef0 100644 --- a/Dalamud/DalamudStartInfo.cs +++ b/Dalamud/DalamudStartInfo.cs @@ -13,6 +13,8 @@ namespace Dalamud { public ClientLanguage Language; public string GameVersion; + + public bool OptOutMbCollection; } ///