Ling0925
/
SharpNBT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed nullability

This commit is contained in:
Eric Freed 2023-08-26 20:08:20 -04:00
parent 6c26878ad7
commit 37723a5282
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SharpNBT/TagReader.cs
View File

@ -16,12 +16,12 @@ public class TagReader : TagIO
/// <summary> /// <summary>
/// Occurs when a tag has been fully deserialized from the stream. /// Occurs when a tag has been fully deserialized from the stream.
/// </summary> /// </summary>
public event TagReaderCallback<TagEventArgs> TagRead; public event TagReaderCallback<TagEventArgs>? TagRead;
/// <summary> /// <summary>
/// Occurs when a tag has been encountered in the stream, after reading the first byte to determine its <see cref="TagType"/>. /// Occurs when a tag has been encountered in the stream, after reading the first byte to determine its <see cref="TagType"/>.
/// </summary> /// </summary>
public event TagReaderCallback<TagHandledEventArgs> TagEncountered; public event TagReaderCallback<TagHandledEventArgs>? TagEncountered;
private readonly bool leaveOpen; private readonly bool leaveOpen;
@ -189,8 +189,6 @@ public class TagReader : TagIO
/// <returns>The deserialized <see cref="IntArrayTag"/> instance.</returns> /// <returns>The deserialized <see cref="IntArrayTag"/> instance.</returns>
public IntArrayTag ReadIntArray(bool named = true) public IntArrayTag ReadIntArray(bool named = true)
{ {
const int INT_SIZE = sizeof(int);
var name = named ? ReadUTF8String() : null; var name = named ? ReadUTF8String() : null;
var count = ReadCount(); var count = ReadCount();
@ -202,8 +200,8 @@ public class TagReader : TagIO
return new IntArrayTag(name, array); return new IntArrayTag(name, array);
} }
var buffer = new byte[count * INT_SIZE]; var buffer = new byte[count * sizeof(int)];
ReadToFixSizedBuffer(buffer, 0, count * INT_SIZE); ReadToFixSizedBuffer(buffer, 0, count * sizeof(int));
Span<int> values = MemoryMarshal.Cast<byte, int>(buffer); Span<int> values = MemoryMarshal.Cast<byte, int>(buffer);
if (SwapEndian) if (SwapEndian)
@ -222,8 +220,6 @@ public class TagReader : TagIO
/// <returns>The deserialized <see cref="LongArrayTag"/> instance.</returns> /// <returns>The deserialized <see cref="LongArrayTag"/> instance.</returns>
public LongArrayTag ReadLongArray(bool named = true) public LongArrayTag ReadLongArray(bool named = true)
{ {
const int LONG_SIZE = sizeof(long);
var name = named ? ReadUTF8String() : null; var name = named ? ReadUTF8String() : null;
var count = ReadCount(); var count = ReadCount();
@ -235,8 +231,8 @@ public class TagReader : TagIO
return new LongArrayTag(name, array); return new LongArrayTag(name, array);
} }
var buffer = new byte[count * LONG_SIZE]; var buffer = new byte[count * sizeof(long)];
ReadToFixSizedBuffer(buffer, 0, count * LONG_SIZE); ReadToFixSizedBuffer(buffer, 0, count * sizeof(long));
Span<long> values = MemoryMarshal.Cast<byte, long>(buffer); Span<long> values = MemoryMarshal.Cast<byte, long>(buffer);
if (SwapEndian) if (SwapEndian)