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.Client/Verbs/UI/VerbMenuElement.cs
View File

@@ -51,7 +51,7 @@ namespace Content.Client.Verbs.UI
OverrideDirection = Direction.South,
SetSize = new Vector2(ElementHeight, ElementHeight),
};
spriteView.SetEntity(verb.IconEntity.Value);
spriteView.SetEntity(entManager.GetEntity(verb.IconEntity.Value));
Icon.AddChild(spriteView);
return;

4
Content.Client/Verbs/UI/VerbMenuUIController.cs
View File

@@ -82,7 +82,7 @@ namespace Content.Client.Verbs.UI
// Add indicator that some verbs may be missing.
// I long for the day when verbs will all be predicted and this becomes unnecessary.
if (!target.IsClientSide())
if (!EntityManager.IsClientSide(target))
{
_context.AddElement(menu, new ContextMenuElement(Loc.GetString("verb-system-waiting-on-server-text")));
}
@@ -244,7 +244,7 @@ namespace Content.Client.Verbs.UI
private void HandleVerbsResponse(VerbsResponseEvent msg)
{
if (OpenMenu == null || !OpenMenu.Visible || CurrentTarget != msg.Entity)
if (OpenMenu == null || !OpenMenu.Visible || CurrentTarget != EntityManager.GetEntity(msg.Entity))
return;
AddServerVerbs(msg.Verbs, OpenMenu);

8
Content.Client/Verbs/VerbSystem.cs
View File

@@ -180,9 +180,9 @@ namespace Content.Client.Verbs
public SortedSet<Verb> GetVerbs(EntityUid target, EntityUid user, List<Type> verbTypes,
bool force = false)
{
if (!target.IsClientSide())
if (!IsClientSide(target))
{
RaiseNetworkEvent(new RequestServerVerbsEvent(target, verbTypes, adminRequest: force));
RaiseNetworkEvent(new RequestServerVerbsEvent(GetNetEntity(target), verbTypes, adminRequest: force));
}
// Some admin menu interactions will try get verbs for entities that have not yet been sent to the player.
@@ -214,11 +214,11 @@ namespace Content.Client.Verbs
return;
}
if (verb.ClientExclusive || target.IsClientSide())
if (verb.ClientExclusive || IsClientSide(target))
// is this a client exclusive (gui) verb?
ExecuteVerb(verb, user.Value, target);
else
EntityManager.RaisePredictiveEvent(new ExecuteVerbEvent(target, verb));
EntityManager.RaisePredictiveEvent(new ExecuteVerbEvent(GetNetEntity(target), verb));
}
private void HandleVerbResponse(VerbsResponseEvent msg)