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

fix: The message server can now be map (#606)

Browse Source
This commit is contained in:
Spatison
2024-08-11 13:54:50 +03:00
committed by GitHub
parent c48ce9c66a
commit 00a58cf850
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem
/// <summary> /// <summary>
/// Updates the user's name in the storage component. /// Updates the user's name in the storage component.
/// </summary> /// </summary>
private void SendName(EntityUid uid, MessagesCartridgeComponent component, CartridgeComponent cartComponent, string? address) public void SendName(EntityUid uid, MessagesCartridgeComponent component, CartridgeComponent cartComponent, string? address)
{ {
TryGetMessagesUser(component, cartComponent, out var messagesUser); TryGetMessagesUser(component, cartComponent, out var messagesUser);

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

@@ -4,6 +4,7 @@ using Content.Server._White.Radio.Components;
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Server.Chat.Systems; using Content.Server.Chat.Systems;
using Content.Server.DeviceNetwork.Systems; using Content.Server.DeviceNetwork.Systems;
using Content.Server.Station.Systems;
using Content.Shared._White.CartridgeLoader.Cartridges; using Content.Shared._White.CartridgeLoader.Cartridges;
using Content.Shared.CartridgeLoader; using Content.Shared.CartridgeLoader;
using Content.Shared.Database; using Content.Shared.Database;
@@ -19,6 +20,7 @@ public sealed class MessagesServerSystem : EntitySystem
[Dependency] private readonly MessagesCartridgeSystem _messagesSystem = default!; [Dependency] private readonly MessagesCartridgeSystem _messagesSystem = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly ChatSystem _chat = default!;
[Dependency] private readonly StationSystem _stationSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -30,19 +32,12 @@ public sealed class MessagesServerSystem : EntitySystem
private void OnInit(EntityUid uid, MessagesServerComponent component, ComponentInit args) private void OnInit(EntityUid uid, MessagesServerComponent component, ComponentInit args)
{ {
var query = EntityQueryEnumerator<MessagesCartridgeComponent>(); var query = EntityQueryEnumerator<MessagesCartridgeComponent>();
var stationId = _stationSystem.GetOwningStation(uid);
while (query.MoveNext(out var entityUid, out var cartridge)) while (query.MoveNext(out var entityUid, out var cartridge))
{ {
if (!TryComp(entityUid, out CartridgeComponent? cartComponent)) if (stationId.HasValue && _singletonServerSystem.TryGetActiveServerAddress<MessagesServerComponent>(stationId.Value, out var address) && TryComp(entityUid, out CartridgeComponent? cartComponent))
continue; _messagesSystem.SendName(entityUid, cartridge, cartComponent, address);
_messagesSystem.TryGetMessagesUser(cartridge, cartComponent, out var messagesUser);
if (cartridge.UserUid == null || messagesUser.Name == Loc.GetString("messages-pda-unknown-name"))
continue;
component.Dictionary[cartridge.UserUid.Value] = messagesUser;
cartridge.LastServer = uid;
} }
} }