From 7b5283b35b9d977e28e47e63302481657fe70911 Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Thu, 6 Mar 2025 18:56:06 +1000 Subject: [PATCH] fix: Knowledge events usings (I hate Rider) --- .../_CP14/Knowledge/ClientCP14KnowledgeSystem.cs | 7 ++++--- Content.Server/_CP14/Knowledge/CP14KnowledgeSystem.cs | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Content.Client/_CP14/Knowledge/ClientCP14KnowledgeSystem.cs b/Content.Client/_CP14/Knowledge/ClientCP14KnowledgeSystem.cs index 5c43fbda72..e493caa375 100644 --- a/Content.Client/_CP14/Knowledge/ClientCP14KnowledgeSystem.cs +++ b/Content.Client/_CP14/Knowledge/ClientCP14KnowledgeSystem.cs @@ -1,11 +1,12 @@ using Content.Shared._CP14.Knowledge; +using Content.Shared._CP14.Knowledge.Events; using Content.Shared._CP14.Knowledge.Prototypes; using Robust.Client.Player; using Robust.Shared.Prototypes; namespace Content.Client._CP14.Knowledge; -public sealed partial class ClientCP14KnowledgeSystem : SharedCP14KnowledgeSystem +public sealed class ClientCP14KnowledgeSystem : SharedCP14KnowledgeSystem { [Dependency] private readonly IPlayerManager _players = default!; @@ -24,7 +25,7 @@ public sealed partial class ClientCP14KnowledgeSystem : SharedCP14KnowledgeSyste if (entity is null) return; - RaiseNetworkEvent(new RequestKnowledgeInfoEvent(GetNetEntity(entity.Value))); + RaiseNetworkEvent(new CP14RequestKnowledgeInfoEvent(GetNetEntity(entity.Value))); } private void OnCharacterKnowledgeEvent(CP14KnowledgeInfoEvent msg, EntitySessionEventArgs args) @@ -37,6 +38,6 @@ public sealed partial class ClientCP14KnowledgeSystem : SharedCP14KnowledgeSyste public readonly record struct KnowledgeData( EntityUid Entity, - HashSet> AllKnowledges + HashSet> AllKnowledge ); } diff --git a/Content.Server/_CP14/Knowledge/CP14KnowledgeSystem.cs b/Content.Server/_CP14/Knowledge/CP14KnowledgeSystem.cs index e632be9614..8dda24305e 100644 --- a/Content.Server/_CP14/Knowledge/CP14KnowledgeSystem.cs +++ b/Content.Server/_CP14/Knowledge/CP14KnowledgeSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Mind; using Content.Server.Popups; using Content.Shared._CP14.Knowledge; using Content.Shared._CP14.Knowledge.Components; +using Content.Shared._CP14.Knowledge.Events; using Content.Shared._CP14.Knowledge.Prototypes; using Content.Shared.Administration; using Content.Shared.Administration.Logs; @@ -39,7 +40,7 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem SubscribeLocalEvent>(AddKnowledgeLearningVerb); SubscribeLocalEvent(KnowledgeLearnedEvent); - SubscribeNetworkEvent(OnRequestKnowledgeInfoEvent); + SubscribeNetworkEvent(OnRequestKnowledgeInfoEvent); } private void KnowledgeLearnedEvent(Entity ent, ref CP14KnowledgeLearnDoAfterEvent args) @@ -254,7 +255,7 @@ public sealed partial class CP14KnowledgeSystem : SharedCP14KnowledgeSystem return true; } - private void OnRequestKnowledgeInfoEvent(RequestKnowledgeInfoEvent msg, EntitySessionEventArgs args) + private void OnRequestKnowledgeInfoEvent(CP14RequestKnowledgeInfoEvent msg, EntitySessionEventArgs args) { if (!args.SenderSession.AttachedEntity.HasValue || args.SenderSession.AttachedEntity != GetEntity(msg.NetEntity)) return;