Minor comp message removal (#6733)

This commit is contained in:
mirrorcult
2022-02-15 20:04:33 -07:00
committed by GitHub
parent 9d422d0762
commit e427381be6
9 changed files with 19 additions and 190 deletions

View File

@@ -5,6 +5,7 @@ using Content.Server.Climbing.Components;
using Content.Server.Popups;
using Content.Server.Stunnable;
using Content.Shared.ActionBlocker;
using Content.Shared.Buckle.Components;
using Content.Shared.Climbing;
using Content.Shared.Damage;
using Content.Shared.GameTicking;
@@ -33,6 +34,7 @@ namespace Content.Server.Climbing
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<ClimbableComponent, GetVerbsEvent<AlternativeVerb>>(AddClimbVerb);
SubscribeLocalEvent<ClimbingComponent, BuckleChangeEvent>(OnBuckleChange);
SubscribeLocalEvent<GlassTableComponent, ClimbedOnEvent>(OnGlassClimbed);
}
@@ -62,6 +64,12 @@ namespace Content.Server.Climbing
args.Verbs.Add(verb);
}
private void OnBuckleChange(EntityUid uid, ClimbingComponent component, BuckleChangeEvent args)
{
if (args.Buckling)
component.IsClimbing = false;
}
private void OnGlassClimbed(EntityUid uid, GlassTableComponent component, ClimbedOnEvent args)
{
_damageableSystem.TryChangeDamage(args.Climber, component.ClimberDamage);

View File

@@ -53,22 +53,6 @@ namespace Content.Server.Climbing.Components
}
}
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public override void HandleMessage(ComponentMessage message, IComponent? component)
{
#pragma warning disable 618
base.HandleMessage(message, component);
#pragma warning restore 618
switch (message)
{
case BuckleMessage msg:
if (msg.Buckled)
IsClimbing = false;
break;
}
}
/// <summary>
/// Make the owner climb from one point to another
/// </summary>