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

Browse Source
This commit is contained in:
mischa 2023-06-23 11:17:26 +08:00
parent d40ca81af1
commit b87004bb8c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/Mirror/Editor/Weaver/Weaver.cs
View File

@ -3,6 +3,7 @@
using System.Diagnostics; using System.Diagnostics;
using Mono.CecilX; using Mono.CecilX;
using Mono.CecilX.Cil; using Mono.CecilX.Cil;
using Mono.CecilX.Rocks;
namespace Mirror.Weaver namespace Mirror.Weaver
{ {
@ -119,23 +120,24 @@ bool WeaveModule(ModuleDefinition moduleDefinition)
Stopwatch watch = Stopwatch.StartNew(); Stopwatch watch = Stopwatch.StartNew();
watch.Start(); watch.Start();
foreach (TypeDefinition td in moduleDefinition.Types) // ModuleDefinition.Types only finds top level types.
// GetAllTypes recursively finds all nested types as well.
// fixes nested types not being weaved, for example:
// class Foo { // ModuleDefinition.Types finds this
// class Nested { // .Types.NestedTypes finds this
// class DeepNested { // only GetAllTypes finds this too
// }
// }
// }
foreach (TypeDefinition td in moduleDefinition.GetAllTypes())
{ {
// weave base type: // weave base type:
Log.Warning($"WEAVER CONSIDERING: {td.FullName}"); Log.Warning($"GETALL: {td.FullName}");
if (td.IsClass && td.BaseType.CanBeResolved()) if (td.IsClass && td.BaseType.CanBeResolved())
{ {
modified |= WeaveNetworkBehavior(td); modified |= WeaveNetworkBehavior(td);
modified |= ServerClientAttributeProcessor.Process(weaverTypes, Log, td, ref WeavingFailed); modified |= ServerClientAttributeProcessor.Process(weaverTypes, Log, td, ref WeavingFailed);
} }
// TODO weave nested types recursively
foreach (TypeDefinition nestedTd in td.NestedTypes)
{
Log.Warning($" NESTED: {nestedTd.FullName}");
modified |= WeaveNetworkBehavior(nestedTd);
modified |= ServerClientAttributeProcessor.Process(weaverTypes, Log, nestedTd, ref WeavingFailed);
}
} }
watch.Stop(); watch.Stop();