From 7896268b293cdeeb8a80aac481eaf8a04f03c892 Mon Sep 17 00:00:00 2001 From: Kitty Draper Date: Mon, 5 Jun 2023 11:33:06 -0500 Subject: [PATCH 1/2] fix: Fix NullReferenceException in CodeGen Credit to @andreyshade --- com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs index 0f28e01783..473e84f219 100644 --- a/com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs +++ b/com.unity.netcode.gameobjects/Editor/CodeGen/CodeGenHelpers.cs @@ -155,7 +155,7 @@ public static MethodReference MakeGeneric(this MethodReference self, params Type public static bool IsSubclassOf(this TypeReference typeReference, TypeReference baseClass) { var type = typeReference.Resolve(); - if (type.BaseType == null || type.BaseType.Name == nameof(Object)) + if (type?.BaseType == null || type.BaseType.Name == nameof(Object)) { return false; } From bd36a25984b259040512801fd2d141be154a7321 Mon Sep 17 00:00:00 2001 From: Kitty Draper Date: Mon, 5 Jun 2023 12:29:40 -0500 Subject: [PATCH 2/2] Changelog --- com.unity.netcode.gameobjects/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index a617b546fc..90d471d315 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -17,6 +17,7 @@ Additional documentation and release notes are available at [Multiplayer Documen ### Fixed +- Fixed: Fixed a null reference in codegen in some projects (#2581) - Fixed issue where the `OnClientDisconnected` client identifier was incorrect after a pending client connection was denied. (#2569) - Fixed warning "Runtime Network Prefabs was not empty at initialization time." being erroneously logged when no runtime network prefabs had been added (#2565) - Fixed issue where some temporary debug console logging was left in a merged PR. (#2562)