Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Server/Disposal/Mailing/MailingUnitSystem.cs
View File

@@ -177,7 +177,7 @@ public sealed class MailingUnitSystem : EntitySystem
var state = new MailingUnitBoundUserInterfaceState(component.DisposalUnitInterfaceState, component.Target, component.TargetList, component.Tag);
if (_userInterfaceSystem.TryGetUi(uid, MailingUnitUiKey.Key, out var bui))
UserInterfaceSystem.SetUiState(bui, state);
_userInterfaceSystem.SetUiState(bui, state);
}
private void OnTargetSelected(EntityUid uid, MailingUnitComponent component, TargetSelectedMessage args)

11
Content.Server/Disposal/Tube/DisposalTubeSystem.cs
View File

@@ -325,8 +325,9 @@ namespace Content.Server.Disposal.Tube
args.Cancel();
}
if (_uiSystem.TryGetUi(uid, SharedDisposalTaggerComponent.DisposalTaggerUiKey.Key, out var bui))
UserInterfaceSystem.SetUiState(bui, new SharedDisposalTaggerComponent.DisposalTaggerUserInterfaceState(tagger.Tag));
if (_uiSystem.TryGetUi(uid, DisposalTaggerUiKey.Key, out var bui))
_uiSystem.SetUiState(bui,
new DisposalTaggerUserInterfaceState(tagger.Tag));
}
/// <summary>
@@ -335,11 +336,11 @@ namespace Content.Server.Disposal.Tube
/// <returns>Returns a <see cref="SharedDisposalRouterComponent.DisposalRouterUserInterfaceState"/></returns>
private void UpdateRouterUserInterface(EntityUid uid, DisposalRouterComponent router)
{
var bui = _uiSystem.GetUiOrNull(uid, SharedDisposalTaggerComponent.DisposalTaggerUiKey.Key);
var bui = _uiSystem.GetUiOrNull(uid, DisposalTaggerUiKey.Key);
if (router.Tags.Count <= 0)
{
if (bui is not null)
UserInterfaceSystem.SetUiState(bui, new SharedDisposalTaggerComponent.DisposalTaggerUserInterfaceState(""));
_uiSystem.SetUiState(bui, new DisposalTaggerUserInterfaceState(""));
return;
}
@@ -354,7 +355,7 @@ namespace Content.Server.Disposal.Tube
taglist.Remove(taglist.Length - 2, 2);
if (bui is not null)
UserInterfaceSystem.SetUiState(bui, new SharedDisposalTaggerComponent.DisposalTaggerUserInterfaceState(taglist.ToString()));
_uiSystem.SetUiState(bui, new DisposalTaggerUserInterfaceState(taglist.ToString()));
}
private void OnAnchorChange(EntityUid uid, DisposalTubeComponent component, ref AnchorStateChangedEvent args)

4
Content.Server/Disposal/TubeConnectionsCommand.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Disposal
return;
}
if (!EntityUid.TryParse(args[0], out var id))
if (!NetEntity.TryParse(args[0], out var idNet) || !_entities.TryGetEntity(idNet, out var id))
{
shell.WriteLine(Loc.GetString("shell-invalid-entity-uid",("uid", args[0])));
return;
@@ -51,7 +51,7 @@ namespace Content.Server.Disposal
return;
}
_entities.System<DisposalTubeSystem>().PopupDirections(id, tube, player.AttachedEntity.Value);
_entities.System<DisposalTubeSystem>().PopupDirections(id.Value, tube, player.AttachedEntity.Value);
}
}
}

2
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (!Resolve(uid, ref holder))
return false;
if (!holder.Container.CanInsert(toInsert))
if (!_containerSystem.CanInsert(toInsert, holder.Container))
{
return false;
}

8
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -96,7 +96,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
component.NextFlush,
component.Powered,
component.Engaged,
component.RecentlyEjected);
GetNetEntityList(component.RecentlyEjected));
}
private void OnUnpaused(EntityUid uid, SharedDisposalUnitComponent component, ref EntityUnpausedEvent args)
@@ -499,7 +499,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
// Can't check if our target AND disposals moves currently so we'll just check target.
// if you really want to check if disposals moves then add a predicate.
var doAfterArgs = new DoAfterArgs(userId.Value, delay, new DisposalDoAfterEvent(), unitId, target: toInsertId, used: unitId)
var doAfterArgs = new DoAfterArgs(EntityManager, userId.Value, delay, new DisposalDoAfterEvent(), unitId, target: toInsertId, used: unitId)
{
BreakOnDamage = true,
BreakOnTargetMove = true,
@@ -753,10 +753,10 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
public override bool CanInsert(EntityUid uid, SharedDisposalUnitComponent component, EntityUid entity)
{
if (!base.CanInsert(uid, component, entity) || component is not SharedDisposalUnitComponent serverComp)
if (!base.CanInsert(uid, component, entity))
return false;
return serverComp.Container.CanInsert(entity);
return _containerSystem.CanInsert(entity, component.Container);
}
/// <summary>