Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge cast with type check

Browse Source
This commit is contained in:
Cinder Biscuits
2020-05-09 08:41:30 -05:00
parent ad32b578d2
commit 823e05df77
23 changed files with 82 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LibreMetaverse/PacketDecoder.cs
View File

@@ -771,8 +771,8 @@ namespace OpenMetaverse.Packets
private static string DecodeNameValue(string fieldName, object fieldData)
{
NameValue[] nameValues = null;
if (fieldData is NameValue[])
nameValues = fieldData as NameValue[];
if (fieldData is NameValue[] data)
nameValues = data;
else
{
string nameValue = Utils.BytesToString((byte[]) fieldData);
@@ -1024,12 +1024,12 @@ namespace OpenMetaverse.Packets
private static string DecodeTimeStamp(string fieldName, object fieldData)
{
if (fieldData is Int32 && (int) fieldData > 0)
if (fieldData is int data && data > 0)
return
$"{fieldName,30}: {fieldData,-10} {"(" + Utils.UnixTimeToDateTime((int) fieldData) + ")",-29} [{fieldData.GetType().Name}]";
else if (fieldData is uint && (uint) fieldData > 0)
$"{fieldName,30}: {data,-10} {"(" + Utils.UnixTimeToDateTime(data) + ")",-29} [{data.GetType().Name}]";
else if (fieldData is uint u && u > 0)
return
$"{fieldName,30}: {fieldData,-10} {"(" + Utils.UnixTimeToDateTime((uint) fieldData) + ")",-29} [{fieldData.GetType().Name}]";
$"{fieldName,30}: {u,-10} {"(" + Utils.UnixTimeToDateTime(u) + ")",-29} [{u.GetType().Name}]";
else
return $"{fieldName,30}: {fieldData,-40} [{fieldData.GetType().Name}]";
}
@@ -1272,8 +1272,8 @@ namespace OpenMetaverse.Packets
private static string DecodeTextureEntry(string fieldName, object fieldData)
{
Primitive.TextureEntry te;
if (fieldData is Primitive.TextureEntry)
te = (Primitive.TextureEntry) fieldData;
if (fieldData is Primitive.TextureEntry data)
te = data;
else
{
byte[] tebytes = (byte[]) fieldData;
@@ -1622,9 +1622,8 @@ namespace OpenMetaverse.Packets
string[] keyList = {decoderKey, decoderKey.Replace("Packet", ""), keys[1] + "." + keys[2], keys[2]};
foreach (string key in keyList)
{
if (fieldData is byte[])
if (fieldData is byte[] fd)
{
byte[] fd = (byte[]) fieldData;
if (!(fd.Length > 0))
{
// bypass the decoder since we were passed an empty byte array