From 6e114cc8e496c76a7cd235f99f08141126c1f722 Mon Sep 17 00:00:00 2001 From: goat Date: Sun, 1 Mar 2020 15:05:28 +0900 Subject: [PATCH] fix: adjust injector paths --- Dalamud.Injector/Program.cs | 4 ++-- Dalamud/Plugin/DalamudPluginInterface.cs | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dalamud.Injector/Program.cs b/Dalamud.Injector/Program.cs index ebf861e6b..3993295b6 100644 --- a/Dalamud.Injector/Program.cs +++ b/Dalamud.Injector/Program.cs @@ -83,9 +83,9 @@ namespace Dalamud.Injector { ConfigurationPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\XIVLauncher\dalamudConfig.json", PluginDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + - @"\XIVLauncher\plugins", + @"\XIVLauncher\installedPluginsI", DefaultPluginDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + - @"\XIVLauncher\defaultplugins", + @"\XIVLauncher\devPluginsI", GameVersion = "2020.02.11.0000.0000", Language = ClientLanguage.English diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs index d6d603346..b4b6d4e47 100644 --- a/Dalamud/Plugin/DalamudPluginInterface.cs +++ b/Dalamud/Plugin/DalamudPluginInterface.cs @@ -107,7 +107,12 @@ namespace Dalamud.Plugin if (!this.dalamud.Configuration.PluginConfigurations.ContainsKey(this.pluginName)) return null; - return this.dalamud.Configuration.PluginConfigurations[this.pluginName] as IPluginConfiguration; + if (!(this.dalamud.Configuration.PluginConfigurations[this.pluginName] is IPluginConfiguration config)) + return null; + + Serilog.Log.Information("Found plugin config for {0} v{1}", this.pluginName, config.Version); + + return config; } #region Logging