diff --git a/Dalamud/Plugin/PluginRepository.cs b/Dalamud/Plugin/PluginRepository.cs index 8c56fb313..2cae03e8b 100644 --- a/Dalamud/Plugin/PluginRepository.cs +++ b/Dalamud/Plugin/PluginRepository.cs @@ -15,8 +15,6 @@ namespace Dalamud.Plugin internal class PluginRepository { private string PluginFunctionBaseUrl => "https://us-central1-xl-functions.cloudfunctions.net/download-plugin/?plugin={0}&isUpdate={1}&isTesting={2}"; private string PluginMasterUrl => "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/master/pluginmaster.json"; - private string PluginJsonUrl = - "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/master/{0}/{1}/{1}.json"; private readonly Dalamud dalamud; @@ -68,13 +66,6 @@ namespace Dalamud.Plugin public bool InstallPlugin(PluginDefinition definition, bool enableAfterInstall = true, bool isUpdate = false, bool fromTesting = false) { try { - using var client = new WebClient(); - - // We need to redownload the json, for the eventuality of the zip having changed after PM download - definition = JsonConvert.DeserializeObject( - client.DownloadString(string.Format(this.PluginJsonUrl, fromTesting ? "testing" : "plugins", - definition.InternalName))); - var outputDir = new DirectoryInfo(Path.Combine(this.pluginDirectory, definition.InternalName, fromTesting ? definition.TestingAssemblyVersion : definition.AssemblyVersion)); var dllFile = new FileInfo(Path.Combine(outputDir.FullName, $"{definition.InternalName}.dll")); var disabledFile = new FileInfo(Path.Combine(outputDir.FullName, ".disabled")); @@ -101,6 +92,8 @@ namespace Dalamud.Plugin } var path = Path.GetTempFileName(); + + using var client = new WebClient(); var doTestingDownload = false; if ((Version.TryParse(definition.TestingAssemblyVersion, out var testingAssemblyVer) || definition.IsTestingExclusive)