From 70249a4db00a462c62a88786eae6c72366b23fdf Mon Sep 17 00:00:00 2001 From: srkizer Date: Sun, 3 Dec 2023 13:57:53 +0900 Subject: [PATCH] Revert "Fix Dalamud trying to unload IServiceType and crashing (#1557)" (#1559) This reverts commit 37bcff84b17714343ad52c9d3aa583874ecbc53c. --- Dalamud/ServiceManager.cs | 2 +- Dalamud/Service{T}.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/ServiceManager.cs b/Dalamud/ServiceManager.cs index 00447da9e..21c08ce72 100644 --- a/Dalamud/ServiceManager.cs +++ b/Dalamud/ServiceManager.cs @@ -336,7 +336,7 @@ internal static class ServiceManager foreach (var serviceType in Assembly.GetExecutingAssembly().GetTypes()) { - if (serviceType.IsAbstract || !serviceType.IsAssignableTo(typeof(IServiceType))) + if (!serviceType.IsAssignableTo(typeof(IServiceType))) continue; // Scoped services shall never be unloaded here. diff --git a/Dalamud/Service{T}.cs b/Dalamud/Service{T}.cs index 08c362433..9c7f0411d 100644 --- a/Dalamud/Service{T}.cs +++ b/Dalamud/Service{T}.cs @@ -176,7 +176,7 @@ internal static class Service where T : IServiceType { foreach (var serviceType in Assembly.GetExecutingAssembly().GetTypes()) { - if (serviceType.IsAbstract || !serviceType.IsAssignableTo(typeof(IServiceType))) + if (!serviceType.IsAssignableTo(typeof(IServiceType))) continue; if (serviceType == typeof(PluginManager))