space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make ExpandPvsEvent lists nullable (#4479)

Browse Source
This commit is contained in:
Leon Friedrich
2023-10-10 04:07:59 +11:00
committed by GitHub
parent a9db89d023
commit 2d58c1071d
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Robust.Server/GameStates/PvsSystem.cs
View File

@@ -774,16 +774,22 @@ internal sealed partial class PvsSystem : EntitySystem
var expandEvent = new ExpandPvsEvent(session);
RaiseLocalEvent(ref expandEvent);
foreach (var entityUid in expandEvent.Entities)
if (expandEvent.Entities != null)
{
RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen, in fromTick,
ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget);
foreach (var entityUid in expandEvent.Entities)
{
RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen, in fromTick,
ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget);
}
}
foreach (var entityUid in expandEvent.RecursiveEntities)
if (expandEvent.RecursiveEntities != null)
{
RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen,in fromTick,
ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget, true);
foreach (var entityUid in expandEvent.RecursiveEntities)
{
RecursivelyAddOverride(in entityUid, lastAcked, lastSent, visibleEnts, lastSeen,in fromTick,
ref newEntityCount, ref enteredEntityCount, ref entStateCount, in newEntityBudget, in enteredEntityBudget, true);
}
}
var entityStates = new List<EntityState>(entStateCount);
@@ -1390,20 +1396,20 @@ Transform last modified: {Transform(uid).LastModifiedTick}");
}
[ByRefEvent]
public readonly struct ExpandPvsEvent
public struct ExpandPvsEvent
{
public readonly IPlayerSession Session;
/// <summary>
/// List of entities that will get added to this session's PVS set.
/// </summary>
public readonly List<EntityUid> Entities = new();
public List<EntityUid>? Entities;
/// <summary>
/// List of entities that will get added to this session's PVS set. Unlike <see cref="Entities"/> this will also
/// recursively add all children of the given entity.
/// </summary>
public readonly List<EntityUid> RecursiveEntities = new();
public List<EntityUid>? RecursiveEntities;
public ExpandPvsEvent(IPlayerSession session)
{