space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-15 06:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add WeakEntityReference (#5577)" (#6112)

Browse Source 
This reverts commit c3489d4ded.
This commit is contained in:
Pieter-Jan Briers
2025-07-29 18:22:17 +02:00
committed by GitHub
parent c3489d4ded
commit dcbe0505dc
19 changed files with 61 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.UnitTesting/Shared/EntitySerialization/TestComponents.cs
-9
View File
@@ -2,7 +2,6 @@ using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
@@ -43,14 +42,6 @@ public sealed partial class EntitySaveTestComponent : Component
}
}
[RegisterComponent]
[NetworkedComponent, AutoGenerateComponentState]
public sealed partial class WeakEntityReferenceTestComponent : Component
{
[DataField, AutoNetworkedField]
public WeakEntityReference Entity;
}
/// <summary>
/// Dummy tile definition for serializing grids.
/// </summary>
Robust.UnitTesting/Shared/EntitySerialization/WeakEntityReferenceTest.cs
-106
View File
@@ -1,106 +0,0 @@
using System.Linq;
using System.Threading.Tasks;
using NUnit.Framework;
using Robust.Shared;
using Robust.Shared.GameObjects;
using Robust.Shared.Network;
using Robust.Shared.Player;
namespace Robust.UnitTesting.Shared.EntitySerialization;
public sealed partial class WeakEntityReferenceTest : RobustIntegrationTest
{
[Test]
public async Task TestWeakEntityReference()
{
var server = StartServer();
var client = StartClient();
await Task.WhenAll(server.WaitIdleAsync(), client.WaitIdleAsync());
var sEntMan = server.EntMan;
var sPlayerMan = server.ResolveDependency<ISharedPlayerManager>();
var cEntMan = client.EntMan;
var cNetMan = client.ResolveDependency<IClientNetManager>();
NetEntity netEntA = default;
NetEntity netEntB = default;
// Set up entities
await server.WaitPost(() =>
{
var entA = sEntMan.Spawn();
var entB = sEntMan.Spawn();
netEntA = sEntMan.GetNetEntity(entA);
netEntB = sEntMan.GetNetEntity(entB);
// Give A a weak reference to B
var comp = sEntMan.AddComponent<WeakEntityReferenceTestComponent>(entA);
comp.Entity = new WeakEntityReference(sEntMan.GetNetEntity(entB));
});
// Connect client.
Assert.DoesNotThrow(() => client.SetConnectTarget(server));
await client.WaitPost(() => cNetMan.ClientConnect(null!, 0, null!));
// Disable PVS so everything gets networked
server.Post(() => server.CfgMan.SetCVar(CVars.NetPVS, false));
async Task RunTicks()
{
for (int i = 0; i < 10; i++)
{
await server.WaitRunTicks(1);
await client.WaitRunTicks(1);
}
}
await RunTicks();
// Put the player into the game so they get entity data
await server.WaitAssertion(() =>
{
var session = sPlayerMan.Sessions.First();
sPlayerMan.JoinGame(session);
});
await RunTicks();
// Make sure the client got entity data
await client.WaitAssertion(() =>
{
Assert.That(cNetMan.IsConnected);
Assert.That(cEntMan.TryGetEntity(netEntA, out var entA));
Assert.That(cEntMan.TryGetEntity(netEntB, out var entB));
Assert.That(cEntMan.TryGetComponent<WeakEntityReferenceTestComponent>(entA, out var comp));
var referencedEnt = cEntMan.Resolve(comp!.Entity);
Assert.That(referencedEnt, Is.EqualTo(entB));
});
// Delete the referenced entity on the server
await server.WaitAssertion(() =>
{
var entB = sEntMan.GetEntity(netEntB);
sEntMan.DeleteEntity(entB);
});
await RunTicks();
// Make sure the client now resolves the reference to null
await client.WaitAssertion(() =>
{
Assert.That(cEntMan.TryGetEntity(netEntA, out var entA));
Assert.That(cEntMan.TryGetComponent<WeakEntityReferenceTestComponent>(entA, out var comp));
var referencedEnt = cEntMan.Resolve(comp!.Entity);
Assert.That(referencedEnt, Is.Null);
});
// Disconnect client
await client.WaitPost(() => cNetMan.ClientDisconnect(""));
await server.WaitRunTicks(5);
await client.WaitRunTicks(5);
// Reset cvar
// I love engine tests
server.Post(() => server.CfgMan.SetCVar(CVars.NetPVS, true));
}
}