fixes decoding arrays

endel · endel · commit adde79f0bdb1 · 2019-04-24T21:00:21.000-03:00
diff --git a/Assets/Plugins/Colyseus/Serializer/Schema/Schema.cs b/Assets/Plugins/Colyseus/Serializer/Schema/Schema.cs
@@ -485,7 +485,7 @@ public void Decode(byte[] bytes, Iterator it = null)
           ISchemaCollection currentValue = valueRef.Clone();
 
           int newLength = Convert.ToInt32(decode.DecodeNumber(bytes, it));
-          int numChanges = Convert.ToInt32(decode.DecodeNumber(bytes, it));
+          int numChanges = Math.Min(Convert.ToInt32(decode.DecodeNumber(bytes, it)), newLength);
 
           hasChange = (numChanges > 0);
 
@@ -494,8 +494,6 @@ public void Decode(byte[] bytes, Iterator it = null)
           // ensure current array has the same length as encoded one
           if (currentValue.Count > newLength)
           {
-            numChanges -= currentValue.Count - newLength;
-
             for (var i = newLength; i < currentValue.Count; i++)
             {
               var item = currentValue[i];

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ public void Decode(byte[] bytes, Iterator it = null)`
`485`	`485`	`ISchemaCollection currentValue = valueRef.Clone();`
`486`	`486`
`487`	`487`	`int newLength = Convert.ToInt32(decode.DecodeNumber(bytes, it));`
`488`		`- int numChanges = Convert.ToInt32(decode.DecodeNumber(bytes, it));`
	`488`	`+ int numChanges = Math.Min(Convert.ToInt32(decode.DecodeNumber(bytes, it)), newLength);`
`489`	`489`
`490`	`490`	`hasChange = (numChanges > 0);`
`491`	`491`
`@@ -494,8 +494,6 @@ public void Decode(byte[] bytes, Iterator it = null)`
`494`	`494`	`// ensure current array has the same length as encoded one`
`495`	`495`	`if (currentValue.Count > newLength)`
`496`	`496`	`{`
`497`		`- numChanges -= currentValue.Count - newLength;`
`498`		`-`
`499`	`497`	`for (var i = newLength; i < currentValue.Count; i++)`
`500`	`498`	`{`
`501`	`499`	`var item = currentValue[i];`