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

Remove redundant client-side error (#3450)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-09 12:56:10 +13:00
committed by GitHub
parent 701606c75a
commit 1ba5c9120f
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Robust.Client/GameStates/ClientGameStateManager.cs
View File

@@ -1180,8 +1180,11 @@ namespace Robust.Client.GameStates
if (!uid.IsClientSide() && _entities.TryGetComponent(uid, out TransformComponent? xform))
_recursiveRemoveState(xform, _entities.GetEntityQuery<TransformComponent>());
_entities.DeleteEntity(uid);
// Set ApplyingState to true to avoid logging errors about predicting the deletion of networked entities.
using (_timing.StartStateApplicationArea())
{
_entities.DeleteEntity(uid);
}
}
/// <summary>

4
Robust.Server/GameStates/PVSSystem.cs
View File

@@ -734,7 +734,7 @@ internal sealed partial class PVSSystem : EntitySystem
var entStateCount = 0;
var stack = _stackPool.Get();
// TODO reorder chunks to prioritize those that are closest to the viewer? Helps make pop0in less visible.
// TODO reorder chunks to prioritize those that are closest to the viewer? Helps make pop-in less visible.
foreach (var i in chunkIndices)
{
var cache = chunkCache[i];
@@ -827,7 +827,7 @@ internal sealed partial class PVSSystem : EntitySystem
#if !FULL_RELEASE
// This happens relatively frequently for the current TickBuffer value, and doesn't really provide any
// useful info when not debugging/testing locally. Hence disabled on FULL_RELEASE.
_sawmill.Warning($"Client {session} exceeded tick buffer.");
_sawmill.Debug($"Client {session} exceeded tick buffer.");
#endif
}
else if (oldEntry.Value.Value != lastAcked)

2
Robust.Shared/GameObjects/Systems/SharedTransformSystem.Component.cs
View File

@@ -423,7 +423,7 @@ public abstract partial class SharedTransformSystem
if (value.EntityId.IsValid())
{
if (!xformQuery.Resolve(value.EntityId, ref newParent))
if (!xformQuery.Resolve(value.EntityId, ref newParent, false))
{
QueueDel(xform.Owner);
throw new InvalidOperationException($"Attempted to parent entity {ToPrettyString(xform.Owner)} to non-existent entity {value.EntityId}");