Skip to content

fix: 2+ inheritance from network behaviour causes compilation exception (#1078) #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 23, 2021
Merged

fix: 2+ inheritance from network behaviour causes compilation exception (#1078) #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0a62e5
fix: 2+ inheritance from network behaviour causes compilation excepti…
becksebenius-unity Aug 23, 2021
0fce610
Update com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourI…
becksebenius-unity Aug 23, 2021
e3554fd
updated comment based on feedback
becksebenius-unity Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,8 @@ private void ProcessNetworkBehaviour(TypeDefinition typeDefinition, string[] ass

// override NetworkBehaviour.__getTypeName() method to return concrete type
{
var baseType = typeDefinition.BaseType.Resolve();
var baseGetTypeNameMethod = baseType.Methods.First(p => p.Name.Equals(nameof(NetworkBehaviour.__getTypeName)));
var networkBehaviour_TypeDef = m_NetworkBehaviour_TypeRef.Resolve();
var baseGetTypeNameMethod = networkBehaviour_TypeDef.Methods.First(p => p.Name.Equals(nameof(NetworkBehaviour.__getTypeName)));

var newGetTypeNameMethod = new MethodDefinition(
nameof(NetworkBehaviour.__getTypeName),
Expand Down
20 changes: 18 additions & 2 deletions com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,30 @@ public void AccessNetworkObjectTest()
}

[Test]
public void GetNetworkBehaviourNameTest()
public void GivenClassDerivesFromNetworkBehaviour_GetTypeNameReturnsCorrectValue()
{
var gameObject = new GameObject(nameof(GetNetworkBehaviourNameTest));
var gameObject = new GameObject(nameof(GivenClassDerivesFromNetworkBehaviour_GetTypeNameReturnsCorrectValue));
var networkBehaviour = gameObject.AddComponent<EmptyNetworkBehaviour>();

Assert.AreEqual(nameof(EmptyNetworkBehaviour), networkBehaviour.__getTypeName());
}

[Test]
public void GivenClassDerivesFromNetworkBehaviourDerivedClass_GetTypeNameReturnsCorrectValue()
{
var gameObject = new GameObject(nameof(GivenClassDerivesFromNetworkBehaviourDerivedClass_GetTypeNameReturnsCorrectValue));
var networkBehaviour = gameObject.AddComponent<DerivedNetworkBehaviour>();

Assert.AreEqual(nameof(DerivedNetworkBehaviour), networkBehaviour.__getTypeName());
}

// Note: in order to repro https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/issues/1078
// this child class must be defined before its parent to assure it is processed first by ILPP
public class DerivedNetworkBehaviour : EmptyNetworkBehaviour
{

}

public class EmptyNetworkBehaviour : NetworkBehaviour
{

Expand Down