tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad reflection usage from OverlayEffectsComponent.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-24 00:14:46 +01:00
parent fcb5787d33
commit 6395345925
4 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
View File

@@ -141,23 +141,11 @@ namespace Content.Client.GameObjects.Components.Mobs
private void UpdateOverlayConfiguration(OverlayContainer container, Overlay overlay)
{
var configurableTypes = overlay.GetType()
.GetInterfaces()
.Where(type =>
type.IsGenericType
&& type.GetGenericTypeDefinition() == typeof(IConfigurable<>)
&& container.Parameters.Exists(p => p.GetType() == type.GenericTypeArguments.First()))
.ToList();
if (configurableTypes.Count > 0)
if (overlay is IConfigurableOverlay configurable)
{
foreach (var type in configurableTypes)
foreach (var param in container.Parameters)
{
var method = type.GetMethod(nameof(IConfigurable<object>.Configure));
var parameter = container.Parameters
.First(p => p.GetType() == type.GenericTypeArguments.First());
method!.Invoke(overlay, new []{ parameter });
configurable.Configure(param);
}
}
}
@@ -169,7 +157,7 @@ namespace Content.Client.GameObjects.Components.Mobs
if (overlayType != null)
{
overlay = Activator.CreateInstance(overlayType) as Overlay;
overlay = IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance<Overlay>(overlayType);
UpdateOverlayConfiguration(container, overlay);
return true;
}