Merge pull request #18 from Megghy/main

fix arrayserializer
atlarge-research · Jul 19, 2022 · 67c6ec6 · 67c6ec6
2 parents e5e0ad3 + 55f14d6
commit 67c6ec6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/TrProtocol/FieldSerializer.cs b/TrProtocol/FieldSerializer.cs
@@ -23,7 +23,7 @@ public override void Write(BinaryWriter bw, object o)
         WriteOverride(bw, (T)o);
     }
 
-    public void Configure(PropertyInfo prop, string version)
+    public IConfigurable Configure(PropertyInfo prop, string version)
     {
         foreach (var bounds in prop.GetCustomAttributes<BoundsAttribute>())
         {
@@ -35,6 +35,7 @@ public void Configure(PropertyInfo prop, string version)
             interrupt = bounds.Interrupt;
             enabled = true;
         }
+        return this;
     }
 }
 public abstract class FieldSerializer<T> : IFieldSerializer

diff --git a/TrProtocol/IFieldSerializer.cs b/TrProtocol/IFieldSerializer.cs
@@ -10,5 +10,5 @@ public interface IFieldSerializer
 
 public interface IConfigurable
 {
-    void Configure(PropertyInfo prop, string version);
+    IConfigurable Configure(PropertyInfo prop, string version);
 }
diff --git a/TrProtocol/PacketSerializer.cs b/TrProtocol/PacketSerializer.cs
@@ -90,7 +90,8 @@ private void RegisterPacket(Type type)
             ser = RequestFieldSerializer(t); // fallback
         serFound:
 
-            if (ser is IConfigurable conf) conf.Configure(prop, Version);
+            if (ser is IConfigurable conf) 
+                ser = (IFieldSerializer)conf.Configure(prop, Version);
 
             if (shouldSerialize)
                 serializer += (o, bw) => { if (condition(o)) ser.Write(bw, getter(o)); };

diff --git a/TrProtocol/Serializers/InternalTypeSerializers.cs b/TrProtocol/Serializers/InternalTypeSerializers.cs
@@ -51,7 +51,7 @@ private class ByteArraySerializer : FieldSerializer<byte[]>
     private class ArraySerializer<T> : FieldSerializer<T[]>, IConfigurable
     {
         private int size;
-        private readonly IFieldSerializer elementSerializer;
+        private IFieldSerializer elementSerializer;
         public ArraySerializer() : this(0)
         {
 
@@ -77,11 +77,15 @@ protected override void WriteOverride(BinaryWriter bw, T[] t)
                 elementSerializer.Write(bw, x);
         }
 
-        public void Configure(PropertyInfo prop, string version)
+        public IConfigurable Configure(PropertyInfo prop, string version)
         {
             if (elementSerializer is IConfigurable conf)
                 conf.Configure(prop, version);
-            size = prop.GetCustomAttribute<ArraySizeAttribute>().Size;
+            return new ArraySerializer<T>()
+            {
+                size = prop.GetCustomAttribute<ArraySizeAttribute>().Size,
+                elementSerializer = elementSerializer
+            };
         }
     }
 }