Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-09-08 13:16:26 +03:00
parent 4c806cbef5 742b2ce04e
commit 7ac9e415c1
73 changed files with 5487 additions and 5535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/_White/CartridgeLoader/Cartridges/MessagesCartridgeSystem.cs
View File

@@ -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<MessagesCartridgeComponent, CartridgeDeactivatedEvent>(OnCartDeactivation);
SubscribeLocalEvent<MessagesCartridgeComponent, CartridgeAddedEvent>(OnCartInsertion);
SubscribeLocalEvent<MessagesCartridgeComponent, ComponentRemove>(OnRemove);
SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawned);
}
public void Send(EntityUid uid, MessagesCartridgeComponent component)
private void OnPlayerSpawned(PlayerSpawnCompleteEvent ev)
{
var stationId = _stationSystem.GetOwningStation(uid);
if (!stationId.HasValue ||
!_singletonServerSystem.TryGetActiveServerAddress<MessagesServerComponent>(stationId.Value,
out var address) || !TryComp(uid, out CartridgeComponent? cartComponent))
if (!_inventorySystem.TryGetSlotEntity(ev.Mob, "id", out var pdaUid) || !HasComp<MindContainerComponent>(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<MessagesServerComponent>(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,

28
Content.Server/_White/Radio/EntitySystems/MessagesServerSystem.cs
View File

@@ -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<MessagesServerComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
SubscribeLocalEvent<MessagesServerComponent, MapInitEvent>(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<MessagesCartridgeComponent>();
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);
}
}
/// <summary>