charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: NetworkBehaviour.SyncVarGameObjectEqual made protected again so that Weaver finds it again

Browse Source
This commit is contained in:
vis2k 2020-03-09 21:51:17 +01:00
parent 76dd0c83bf
commit 165a1dd94c
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Mirror/Runtime/NetworkBehaviour.cs
View File

@ -469,8 +469,10 @@ public static CmdDelegate GetDelegate(int cmdHash)
#region Helpers
// helper function for [SyncVar] GameObjects.
// IMPORTANT: keep as 'protected', not 'internal', otherwise Weaver
// can't resolve it
[EditorBrowsable(EditorBrowsableState.Never)]
internal bool SyncVarGameObjectEqual(GameObject newGameObject, uint netIdField)
protected bool SyncVarGameObjectEqual(GameObject newGameObject, uint netIdField)
{
uint newNetId = 0;
if (newGameObject != null)

32
Assets/Mirror/Tests/Editor/NetworkBehaviourTests.cs
View File

@ -13,6 +13,14 @@ class EmptyBehaviour : NetworkBehaviour
{
}
class SyncVarGameObjectEqualExposedBehaviour : NetworkBehaviour
{
public bool SyncVarGameObjectEqualExposed(GameObject newGameObject, uint netIdField)
{
return SyncVarGameObjectEqual(newGameObject, netIdField);
}
}
// we need to inherit from networkbehaviour to test protected functions
public class NetworkBehaviourSendCommandInternalComponent : NetworkBehaviour
{
@ -781,7 +789,8 @@ public void SyncVarGameObjectEqualZeroNetIdNullIsTrue()
// better to return false here.
// => we possibly return false so that resync doesn't happen when
// GO disappears? or not?
bool result = emptyBehaviour.SyncVarGameObjectEqual(null, identity.netId);
SyncVarGameObjectEqualExposedBehaviour comp = gameObject.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
bool result = comp.SyncVarGameObjectEqualExposed(null, identity.netId);
Assert.That(result, Is.True);
}
@ -793,7 +802,8 @@ public void SyncVarGameObjectEqualNull()
identity.netId = 42;
// null should return false
bool result = emptyBehaviour.SyncVarGameObjectEqual(null, identity.netId);
SyncVarGameObjectEqualExposedBehaviour comp = gameObject.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
bool result = comp.SyncVarGameObjectEqualExposed(null, identity.netId);
Assert.That(result, Is.False);
}
@ -808,7 +818,8 @@ public void SyncVarGameObjectEqualZeroNetIdAndGOWithoutIdentityComponentIsTrue()
// => we possibly return false so that resync doesn't happen when
// GO disappears? or not?
GameObject go = new GameObject();
bool result = emptyBehaviour.SyncVarGameObjectEqual(go, identity.netId);
SyncVarGameObjectEqualExposedBehaviour comp = go.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
bool result = comp.SyncVarGameObjectEqualExposed(go, identity.netId);
Assert.That(result, Is.True);
}
@ -821,7 +832,8 @@ public void SyncVarGameObjectEqualWithoutIdentityComponent()
// gameobject without networkidentity component should return false
GameObject go = new GameObject();
bool result = emptyBehaviour.SyncVarGameObjectEqual(go, identity.netId);
SyncVarGameObjectEqualExposedBehaviour comp = go.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
bool result = comp.SyncVarGameObjectEqualExposed(go, identity.netId);
Assert.That(result, Is.False);
// clean up
@ -838,8 +850,9 @@ public void SyncVarGameObjectEqualValidGOWithDifferentNetId()
// gameobject with valid networkidentity and netid that is different
GameObject go = new GameObject();
NetworkIdentity ni = go.AddComponent<NetworkIdentity>();
SyncVarGameObjectEqualExposedBehaviour comp = go.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
ni.netId = 43;
bool result = emptyBehaviour.SyncVarGameObjectEqual(go, identity.netId);
bool result = comp.SyncVarGameObjectEqualExposed(go, identity.netId);
Assert.That(result, Is.False);
// clean up
@ -856,8 +869,9 @@ public void SyncVarGameObjectEqualValidGOWithSameNetId()
// gameobject with valid networkidentity and netid that is different
GameObject go = new GameObject();
NetworkIdentity ni = go.AddComponent<NetworkIdentity>();
SyncVarGameObjectEqualExposedBehaviour comp = go.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
ni.netId = 42;
bool result = emptyBehaviour.SyncVarGameObjectEqual(go, identity.netId);
bool result = comp.SyncVarGameObjectEqualExposed(go, identity.netId);
Assert.That(result, Is.True);
// clean up
@ -874,8 +888,9 @@ public void SyncVarGameObjectEqualUnspawnedGO()
// gameobject with valid networkidentity and 0 netid that is unspawned
GameObject go = new GameObject();
go.AddComponent<NetworkIdentity>();
SyncVarGameObjectEqualExposedBehaviour comp = go.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
LogAssert.Expect(LogType.Warning, "SetSyncVarGameObject GameObject " + go + " has a zero netId. Maybe it is not spawned yet?");
bool result = emptyBehaviour.SyncVarGameObjectEqual(go, identity.netId);
bool result = comp.SyncVarGameObjectEqualExposed(go, identity.netId);
Assert.That(result, Is.False);
// clean up
@ -889,8 +904,9 @@ public void SyncVarGameObjectEqualUnspawnedGOZeroNetIdIsTrue()
// unspawned go and identity.netid==0 returns true (=equal)
GameObject go = new GameObject();
go.AddComponent<NetworkIdentity>();
SyncVarGameObjectEqualExposedBehaviour comp = go.AddComponent<SyncVarGameObjectEqualExposedBehaviour>();
LogAssert.Expect(LogType.Warning, "SetSyncVarGameObject GameObject " + go + " has a zero netId. Maybe it is not spawned yet?");
bool result = emptyBehaviour.SyncVarGameObjectEqual(go, identity.netId);
bool result = comp.SyncVarGameObjectEqualExposed(go, identity.netId);
Assert.That(result, Is.True);
// clean up