From dc76a9a8894b5c484404e12bdad3ba1731557646 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Fri, 6 Sep 2024 20:18:36 +0300 Subject: [PATCH] fix (#687) --- .../Systems/SingletonDeviceNetServerSystem.cs | 12 ------- .../Cartridges/MessagesCartridgeSystem.cs | 31 ++++++++++++++----- .../EntitySystems/MessagesServerSystem.cs | 28 ----------------- .../Structures/Machine/messege_server.yml | 10 ++---- 4 files changed, 26 insertions(+), 55 deletions(-) diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs index 8d1291b76d..5fdcad7697 100644 --- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs @@ -29,18 +29,6 @@ public sealed class SingletonDeviceNetServerSystem : EntitySystem return Resolve(serverId, ref serverComponent) && serverComponent.Active; } - /// - /// Set server active. WD EDIT - /// - public bool SetServerActive(EntityUid serverId, bool active, SingletonDeviceNetServerComponent? serverComponent = default) - { - if (!Resolve(serverId, ref serverComponent)) - return false; - - serverComponent.Active = active; - return true; - } - /// /// Returns the address of the currently active server for the given station id if there is one.
/// What kind of server you're trying to get the active instance of is determined by the component type parameter TComp.
diff --git a/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs b/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs index b99c19b88b..b636d83962 100644 --- a/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs +++ b/Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs @@ -10,6 +10,8 @@ using Content.Server.DeviceNetwork.Systems; using Content.Shared.DeviceNetwork; using Content.Server.Station.Systems; using Content.Shared._White.CartridgeLoader.Cartridges; +using Content.Shared.Inventory; +using Content.Shared.Mind.Components; namespace Content.Server._White.CartridgeLoader.Cartridges; @@ -22,6 +24,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private readonly InventorySystem _inventorySystem = default!; public override void Initialize() { @@ -33,18 +36,30 @@ public sealed class MessagesCartridgeSystem : EntitySystem SubscribeLocalEvent(OnCartDeactivation); SubscribeLocalEvent(OnCartInsertion); SubscribeLocalEvent(OnRemove); + + SubscribeLocalEvent(OnPlayerSpawned); } - public void Send(EntityUid uid, MessagesCartridgeComponent component) + private void OnPlayerSpawned(PlayerSpawnCompleteEvent ev) { - var stationId = _stationSystem.GetOwningStation(uid); - if (!stationId.HasValue || - !_singletonServerSystem.TryGetActiveServerAddress(stationId.Value, - out var address) || !TryComp(uid, out CartridgeComponent? cartComponent)) + if (!_inventorySystem.TryGetSlotEntity(ev.Mob, "id", out var pdaUid) || !HasComp(ev.Mob)) + return; + MessagesCartridgeComponent? comp = null; + + var programs = _cartridgeLoaderSystem.GetInstalled(pdaUid.Value); + var program = programs.ToList().Find(program => TryComp(program, out comp)); + + if (comp == null) return; - component.UserUid = cartComponent.LoaderUid?.Id; - SendName(uid, component, cartComponent, address); + if (!TryComp(program, out CartridgeComponent? cartComponent)) + return; + + var stationId = _stationSystem.GetOwningStation(pdaUid); + if (!stationId.HasValue || !_singletonServerSystem.TryGetActiveServerAddress(stationId.Value, out var address)) + return; + + SendName(pdaUid.Value, comp, cartComponent, address); } private void OnRemove(EntityUid uid, MessagesCartridgeComponent component, ComponentRemove args) @@ -172,7 +187,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem public void SendName(EntityUid uid, MessagesCartridgeComponent component, CartridgeComponent cartComponent, string? address) { TryGetMessagesUser(component, cartComponent, out var messagesUser); - +; var packet = new NetworkPayload() { [MessagesNetworkKeys.UserId] = component.UserUid, diff --git a/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs b/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs index 27967e3049..87a1022624 100644 --- a/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs +++ b/Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs @@ -1,13 +1,9 @@ using System.Linq; -using Content.Server._White.CartridgeLoader.Cartridges; using Content.Server._White.Radio.Components; using Content.Server.Administration.Logs; using Content.Server.Chat.Systems; -using Content.Server.DeviceNetwork.Components; using Content.Server.DeviceNetwork.Systems; -using Content.Server.Station.Systems; using Content.Shared._White.CartridgeLoader.Cartridges; -using Content.Shared.CartridgeLoader; using Content.Shared.Database; using Content.Shared.DeviceNetwork; @@ -18,37 +14,13 @@ public sealed class MessagesServerSystem : EntitySystem { [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; - [Dependency] private readonly MessagesCartridgeSystem _messagesSystem = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnPacketReceived); - SubscribeLocalEvent(OnInit); - } - - private void OnInit(EntityUid uid, MessagesServerComponent component, MapInitEvent args) - { - if (!TryComp(uid, out DeviceNetworkComponent? device) || !_singletonServerSystem.SetServerActive(uid, true)) - return; - - _deviceNetworkSystem.ConnectDevice(uid, device); - - var stationIdServer = _stationSystem.GetOwningStation(uid); - if (!stationIdServer.HasValue) - return; - - var query = EntityQueryEnumerator(); - - while (query.MoveNext(out var entityUid, out var cartridge)) - { - var stationId = _stationSystem.GetOwningStation(entityUid); - if (stationId.HasValue && stationIdServer == stationId && TryComp(entityUid, out CartridgeComponent? cartComponent)) - _messagesSystem.SendName(entityUid, cartridge, cartComponent, device.Address); - } } /// diff --git a/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml b/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml index 534a6cb2d6..732731c512 100644 --- a/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml +++ b/Resources/Prototypes/_White/Entities/Structures/Machine/messege_server.yml @@ -1,6 +1,6 @@ - type: entity id: MessagesServer - parent: BaseMachinePowered + parent: BaseMachine name: PDA messaging server description: Server that allows PDA messaging to function on the station. components: @@ -9,9 +9,6 @@ layers: - state: server - state: variant-research - - type: ApcPowerReceiver - powerLoad: 200 - - type: ExtensionCableReceiver - type: Destructible thresholds: - trigger: @@ -43,11 +40,11 @@ - type: AmbientOnPowered - type: MessagesServer - type: SingletonDeviceNetServer + available: true - type: DeviceNetwork deviceNetId: Wireless transmitFrequencyId: NTMessagesServer receiveFrequencyId: NTMessagesClient - autoConnect: false - type: StationLimitedNetwork - type: entity @@ -59,5 +56,4 @@ - type: DeviceNetwork deviceNetId: Wireless transmitFrequencyId: SyndicateMessagesServer - receiveFrequencyId: SyndicateMessagesClient - autoConnect: false \ No newline at end of file + receiveFrequencyId: SyndicateMessagesClient \ No newline at end of file