Fix a couple of nbt exceptions (#479)

Author: Tides

Obsidian.API/_Interfaces/IEntity.cs

@@ -22,7 +22,7 @@ public interface IEntity
 
     public BoundingBox BoundingBox { get; }
     public EntityDimension Dimension { get; }
-    public int Air { get; set; }
+    public short Air { get; set; }
 
     public float Health { get; set; }
 

Obsidian.Nbt/NbtCompound.cs

@@ -46,7 +46,7 @@ public NbtCompound(string name, List<INbtTag> children) : this(name)
     public bool TryGetTag(string name, [MaybeNullWhen(false)] out INbtTag tag) => this.children.TryGetValue(name, out tag);
     public bool TryGetTag<T>(string name, [MaybeNullWhen(false)] out T tag) where T : INbtTag
     {
-        if (this.children.TryGetValue(name, out var childTag) && childTag is T matchedTag)
+        if (this.TryGetTag(name, out var childTag) && childTag is T matchedTag)
         {
             tag = matchedTag;
             return true;
@@ -55,19 +55,19 @@ public bool TryGetTag<T>(string name, [MaybeNullWhen(false)] out T tag) where T
         tag = default;
         return false;
     }
-    public bool TryGetTagValue<TValue>(string name, [MaybeNullWhen(false)]out TValue value)
+
+    public bool TryGetTagValue<TValue>(string name, [MaybeNullWhen(false)] out TValue value)
     {
-        if(this.GetTagValue<TValue>(name) is TValue tagValue)
+        if (this.TryGetTag<NbtTag<TValue>>(name, out var tag))
         {
-            value = tagValue;
+            value = tag.Value;
             return true;
         }
 
         value = default;
         return false;
     }
 
-
     public byte GetByte(string name) => this.GetTagValue<byte>(name);
 
     public short GetShort(string name) => this.GetTagValue<short>(name);
@@ -149,11 +149,5 @@ public IEnumerator<KeyValuePair<string, INbtTag>> GetEnumerator() =>
 
     IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
 
-    private T? GetTagValue<T>(string name)
-    {
-        if (this.TryGetTag(name, out var tag) && tag is NbtTag<T> actualTag)
-            return actualTag.Value;
-
-        throw new TagNotFoundException(name);
-    }
+    private T? GetTagValue<T>(string name) => this.TryGetTag(name, out var tag) && tag is NbtTag<T> actualTag ? actualTag.Value : throw new TagNotFoundException(name);
 }

Obsidian/Entities/Entity.cs

@@ -39,7 +39,7 @@ public class Entity : IEquatable<Entity>, IEntity
 
     public EntityType Type { get; set; }
 
-    public int Air { get; set; } = 300;
+    public short Air { get; set; } = 300;
 
     public float Health { get; set; } = 100;
 

Obsidian/Entities/Player.Helpers.cs

@@ -51,6 +51,8 @@ public async Task SaveAsync()
         writer.WriteInt("XpLevel", XpLevel);
         writer.WriteInt("XpTotal", XpTotal);
 
+        writer.WriteShort("Air", Air);
+
         writer.WriteFloat("Health", Health);
 
         writer.WriteFloat("foodExhaustionLevel", FoodExhaustionLevel);

Obsidian/Net/MinecraftStream.Reading.cs

@@ -584,7 +584,7 @@ public ChatMessage ReadChat()
         var reader = new NbtReader(this);
         var chatMessage = ChatMessage.Empty;
 
-        return !reader.TryReadNextTag<NbtCompound>(out var root) ? chatMessage : chatMessage.FromNbt(root);
+        return !reader.TryReadNextTag<NbtCompound>(false, out var root) ? chatMessage : chatMessage.FromNbt(root);
     }
 
     [ReadMethod]