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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.CartridgeLoader;
using Content.Shared.CartridgeLoader.Cartridges;
using Content.Shared.CCVar;
using Robust.Shared.Configuration;
using Robust.Shared.Containers;
using Robust.Shared.Prototypes;
namespace Content.Server.CartridgeLoader.Cartridges;
@@ -41,7 +42,7 @@ public sealed class CrewManifestCartridgeSystem : EntitySystem
/// </remarks>
private void OnUiMessage(EntityUid uid, CrewManifestCartridgeComponent component, CartridgeMessageEvent args)
{
UpdateUiState(uid, args.LoaderUid, component);
UpdateUiState(uid, GetEntity(args.LoaderUid), component);
}
/// <summary>
@@ -78,14 +79,17 @@ public sealed class CrewManifestCartridgeSystem : EntitySystem
{
_unsecureViewersAllowed = unsecureViewersAllowed;
var allCartridgeLoaders = AllEntityQuery<CartridgeLoaderComponent>();
while (allCartridgeLoaders.MoveNext(out EntityUid loaderUid, out CartridgeLoaderComponent? comp))
var allCartridgeLoaders = AllEntityQuery<CartridgeLoaderComponent, ContainerManagerComponent>();
while (allCartridgeLoaders.MoveNext(out var loaderUid, out var comp, out var cont))
{
if (_unsecureViewersAllowed)
_cartridgeLoader?.InstallProgram(loaderUid, CartridgePrototypeName, false, comp);
else
_cartridgeLoader?.UninstallProgram(loaderUid, CartridgePrototypeName, comp);
{
_cartridgeLoader.InstallProgram(loaderUid, CartridgePrototypeName, false, comp);
return;
}
if (_cartridgeLoader.TryGetProgram<CrewManifestCartridgeComponent>(loaderUid, out var program, true, comp, cont))
_cartridgeLoader.UninstallProgram(loaderUid, program.Value, comp);
}
}

2
Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs
View File

@@ -42,7 +42,7 @@ public sealed class NotekeeperCartridgeSystem : EntitySystem
component.Notes.Remove(message.Note);
}
UpdateUiState(uid, args.LoaderUid, component);
UpdateUiState(uid, GetEntity(args.LoaderUid), component);
}