Minor comp message removal (#6733)

Content.Server/Buckle/Components/BuckleComponent.cs

@@ -237,9 +237,8 @@ namespace Content.Server.Buckle.Components
 
             UpdateBuckleStatus();
 
-#pragma warning disable 618
-            SendMessage(new BuckleMessage(Owner, to));
-#pragma warning restore 618
+            var ev = new BuckleChangeEvent() { Buckling = true, Strap = BuckledTo.Owner };
+            _entMan.EventBus.RaiseLocalEvent(Owner, ev, false);
 
             if (_entMan.TryGetComponent(Owner, out SharedPullableComponent? ownerPullable))
             {
@@ -330,9 +329,8 @@ namespace Content.Server.Buckle.Components
             oldBuckledTo.Remove(this);
             SoundSystem.Play(Filter.Pvs(Owner), oldBuckledTo.UnbuckleSound.GetSound(), Owner);
 
-#pragma warning disable 618
-            SendMessage(new UnbuckleMessage(Owner, oldBuckledTo.Owner));
-#pragma warning restore 618
+            var ev = new BuckleChangeEvent() { Buckling = false, Strap = oldBuckledTo.Owner };
+            _entMan.EventBus.RaiseLocalEvent(Owner, ev, false);
 
             return true;
         }

Content.Server/Buckle/Components/StrapComponent.cs

@@ -162,10 +162,6 @@ namespace Content.Server.Buckle.Components
                 appearance.SetData("StrapState", true);
             }
 
-#pragma warning disable 618
-            SendMessage(new StrapMessage(buckle.Owner, Owner));
-#pragma warning restore 618
-
             return true;
         }
 
@@ -184,9 +180,6 @@ namespace Content.Server.Buckle.Components
                 }
 
                 _occupiedSize -= buckle.Size;
-#pragma warning disable 618
-                SendMessage(new UnStrapMessage(buckle.Owner, Owner));
-#pragma warning restore 618
             }
         }
 

Content.Server/Climbing/ClimbSystem.cs

@@ -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);

Content.Server/Climbing/Components/ClimbingComponent.cs

@@ -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>

Content.Server/Configurable/ConfigurationComponent.cs

@@ -110,9 +110,7 @@ namespace Content.Server.Configurable
                     _config[key] = value;
                 }
 
-#pragma warning disable 618
-                SendMessage(new ConfigUpdatedComponentMessage(config));
-#pragma warning restore 618
+                // TODO raise event.
             }
         }