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-08-13 22:18:51 +03:00
parent dbb90cab56 5a0bc40b7e
commit cbd6a8cff2
28 changed files with 32303 additions and 31023 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();

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

@@ -3,6 +3,7 @@ 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;
@@ -26,18 +27,27 @@ public sealed class MessagesServerSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<MessagesServerComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
SubscribeLocalEvent<MessagesServerComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<MessagesServerComponent, MapInitEvent>(OnInit);
}
private void OnInit(EntityUid uid, MessagesServerComponent component, ComponentInit args)
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>();
var stationId = _stationSystem.GetOwningStation(uid);
while (query.MoveNext(out var entityUid, out var cartridge))
{
if (stationId.HasValue && _singletonServerSystem.TryGetActiveServerAddress<MessagesServerComponent>(stationId.Value, out var address) && TryComp(entityUid, out CartridgeComponent? cartComponent))
_messagesSystem.SendName(entityUid, cartridge, cartComponent, address);
var stationId = _stationSystem.GetOwningStation(entityUid);
if (stationId.HasValue && stationIdServer == stationId && TryComp(entityUid, out CartridgeComponent? cartComponent))
_messagesSystem.SendName(entityUid, cartridge, cartComponent, device.Address);
}
}

14
Content.Server/_White/Wizard/Charging/ChargingSystem.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared._White.Wizard;
using Content.Server.Actions;
using Content.Shared._White.Wizard;
using Content.Shared._White.Wizard.Charging;
using Content.Shared.Actions;
using Content.Shared.Follower;
using Content.Shared.Mobs;
using Robust.Shared.Audio;
@@ -12,6 +14,7 @@ public sealed class ChargingSystem : SharedChargingSystem
{
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly FollowerSystem _followerSystem = default!;
[Dependency] private readonly ActionsSystem _actionsSystem = default!;
private readonly Dictionary<EntityUid, List<EntityUid>> _charges = new();
@@ -132,8 +135,15 @@ public sealed class ChargingSystem : SharedChargingSystem
private void Add(AddWizardChargeEvent msg, EntitySessionEventArgs args)
{
var spell = GetEntity(msg.Spell);
if (!_actionsSystem.TryGetActionData(spell, out var baseAction) ||
baseAction is not BaseTargetActionComponent action || !action.IsChargeEnabled)
{
return;
}
if (args.SenderSession.AttachedEntity != null)
AddCharge(args.SenderSession.AttachedEntity.Value, msg.ChargeProto);
AddCharge(args.SenderSession.AttachedEntity.Value, action.ChargeProto);
}
private void Remove(RemoveWizardChargeEvent msg, EntitySessionEventArgs args)