tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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/Pointing/EntitySystems/PointingSystem.cs
View File

@@ -65,6 +65,8 @@ namespace Content.Server.Pointing.EntitySystems
private void SendMessage(EntityUid source, IEnumerable<ICommonSession> viewers, EntityUid pointed, string selfMessage,
string viewerMessage, string? viewerPointedAtMessage = null)
{
var netSource = GetNetEntity(source);
foreach (var viewer in viewers)
{
if (viewer.AttachedEntity is not {Valid: true} viewerEntity)
@@ -78,10 +80,10 @@ namespace Content.Server.Pointing.EntitySystems
? viewerPointedAtMessage
: viewerMessage;
RaiseNetworkEvent(new PopupEntityEvent(message, PopupType.Small, source), viewerEntity);
RaiseNetworkEvent(new PopupEntityEvent(message, PopupType.Small, netSource), viewerEntity);
}
_replay.RecordServerMessage(new PopupEntityEvent(viewerMessage, PopupType.Small, source));
_replay.RecordServerMessage(new PopupEntityEvent(viewerMessage, PopupType.Small, netSource));
}
public bool InRange(EntityUid pointer, EntityCoordinates coordinates)
@@ -100,13 +102,13 @@ namespace Content.Server.Pointing.EntitySystems
{
if (session?.AttachedEntity is not { } player)
{
Logger.Warning($"Player {session} attempted to point without any attached entity");
Log.Warning($"Player {session} attempted to point without any attached entity");
return false;
}
if (!coords.IsValid(EntityManager))
{
Logger.Warning($"Player {ToPrettyString(player)} attempted to point at invalid coordinates: {coords}");
Log.Warning($"Player {ToPrettyString(player)} attempted to point at invalid coordinates: {coords}");
return false;
}
@@ -247,10 +249,12 @@ namespace Content.Server.Pointing.EntitySystems
private void OnPointAttempt(PointingAttemptEvent ev, EntitySessionEventArgs args)
{
if (TryComp(ev.Target, out TransformComponent? xform))
TryPoint(args.SenderSession, xform.Coordinates, ev.Target);
var target = GetEntity(ev.Target);
if (TryComp(target, out TransformComponent? xform))
TryPoint(args.SenderSession, xform.Coordinates, target);
else
Logger.Warning($"User {args.SenderSession} attempted to point at a non-existent entity uid: {ev.Target}");
Log.Warning($"User {args.SenderSession} attempted to point at a non-existent entity uid: {ev.Target}");
}
public override void Shutdown()