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

fix: Message server now can see new user (#611)

Browse Source
This commit is contained in:
Spatison
2024-08-12 13:29:49 +03:00
committed by GitHub
parent 20b728448f
commit 8579ab7602
5 changed files with 94 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,8 @@ public sealed class MessagesCartridgeSystem : EntitySystem
out var address) || !TryComp(uid, out CartridgeComponent? cartComponent))
return;
SendName(uid, component, cartComponent, address);
component.UserUid = cartComponent.LoaderUid?.Id;
SendName(uid, component, cartComponent, address);
}
private void OnRemove(EntityUid uid, MessagesCartridgeComponent component, ComponentRemove args)
@@ -179,6 +179,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem
[MessagesNetworkKeys.UserId] = component.UserUid,
[MessagesNetworkKeys.NewUser] = messagesUser
};
_deviceNetworkSystem.QueuePacket(uid, address, packet);
}
@@ -199,7 +200,7 @@ public sealed class MessagesCartridgeSystem : EntitySystem
/// <summary>
/// Returns the user's name, job title and job department
/// </summary>
public bool TryGetMessagesUser(MessagesCartridgeComponent component, CartridgeComponent cartridgeComponent, out MessagesUserData messagesUserData)
private bool TryGetMessagesUser(MessagesCartridgeComponent component, CartridgeComponent cartridgeComponent, out MessagesUserData messagesUserData)
{
messagesUserData = new MessagesUserData();