Fix bad reflection usage from OverlayEffectsComponent.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ using SixLabors.ImageSharp.PixelFormats;
|
||||
|
||||
namespace Content.Client.Graphics.Overlays
|
||||
{
|
||||
public class FlashOverlay : Overlay, IConfigurable<TimedOverlayParameter>
|
||||
public class FlashOverlay : Overlay, IConfigurableOverlay
|
||||
{
|
||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||
[Dependency] private readonly IClyde _displayManager = default!;
|
||||
@@ -61,9 +61,12 @@ namespace Content.Client.Graphics.Overlays
|
||||
_screenshotTexture = null;
|
||||
}
|
||||
|
||||
public void Configure(TimedOverlayParameter parameters)
|
||||
public void Configure(OverlayParameter parameters)
|
||||
{
|
||||
_lastsFor = parameters.Length;
|
||||
if (parameters is TimedOverlayParameter timedParams)
|
||||
{
|
||||
_lastsFor = timedParams.Length;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
namespace Content.Shared.Interfaces
|
||||
{
|
||||
public interface IConfigurable<in T>
|
||||
{
|
||||
public void Configure(T parameters);
|
||||
}
|
||||
}
|
||||
9
Content.Shared/Interfaces/IConfigurableOverlay.cs
Normal file
9
Content.Shared/Interfaces/IConfigurableOverlay.cs
Normal file
@@ -0,0 +1,9 @@
|
||||
using Content.Shared.GameObjects.Components.Mobs;
|
||||
|
||||
namespace Content.Shared.Interfaces
|
||||
{
|
||||
public interface IConfigurableOverlay
|
||||
{
|
||||
void Configure(OverlayParameter parameter);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user