Fix #50

Author: valkyrienyanko

LuaModdingTest.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Godot.NET.Sdk/3.3.0">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
+    <LangVersion>10</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MoonSharp" Version="2.0.0" />

Scripts/Netcode/Common/CPacketLobbyChatMessage.cs

@@ -1,4 +1,5 @@
 using GodotModules.Netcode.Server;
+using System.IO;
 
 namespace GodotModules.Netcode 
 {

Scripts/Netcode/Common/CPacketPlayerPosition.cs

@@ -26,12 +26,12 @@ public override void Handle(ENet.Peer peer)
         {
             GameServer.Players[peer.ID].Position = Position;
 
-            foreach (var pair in GameServer.Players)
+            /*foreach (var pair in GameServer.Players)
             {
                 GameServer.Send(ServerPacketOpcode.PlayerPositions, new SPacketPlayerPositions {
                     PlayerPositions = GameServer.Players.Where(x => x.Key != pair.Key).ToDictionary(x => x.Key, x => x.Value.Position)
                 }, GameServer.Peers[pair.Key]);
-            }
+            }*/
         }
     }
 }

Scripts/Netcode/Common/Core/ClientPacket.cs

@@ -11,9 +11,8 @@ public ClientPacket(byte opcode, PacketFlags flags, APacket writable = null)
                 writer.Write(opcode);
                 if (writable != null) writable.Write(writer);
 
-                var stream = writer.GetStream();
-                Data = stream.ToArray();
-                Size = stream.Length;
+                Data = writer.Stream.ToArray();
+                Size = writer.Stream.Length;
             }
 
             PacketFlags = flags;

Scripts/Netcode/Common/Core/PacketReader.cs

@@ -1,25 +1,42 @@
 using ENet;
+using System;
 using System.IO;
 
 namespace GodotModules.Netcode
 {
-    public class PacketReader : BinaryReader
+    public class PacketReader : IDisposable
     {
-        private static readonly byte[] ReadBuffer = new byte[GamePacket.MaxSize];
+        private MemoryStream Stream { get; set; }
+        private BinaryReader Reader { get; set; }
+        private readonly byte[] ReadBuffer = new byte[GamePacket.MaxSize];
 
-        public PacketReader(Packet packet) : base(new MemoryStream(ReadBuffer))
+        public PacketReader(Packet packet)
         {
-            BaseStream.Position = 0;
+            Stream = new MemoryStream(ReadBuffer);
+            Reader = new BinaryReader(Stream);
             packet.CopyTo(ReadBuffer);
             packet.Dispose();
         }
 
-        public bool ReadBool() => base.ReadBoolean();
+        public byte ReadByte() => Reader.ReadByte();
+        public sbyte ReadSByte() => Reader.ReadSByte();
+        public char ReadChar() => Reader.ReadChar();
+        public string ReadString() => Reader.ReadString();
+        public bool ReadBool() => Reader.ReadBoolean();
+        public short ReadShort() => Reader.ReadInt16();
+        public ushort ReadUShort() => Reader.ReadUInt16();
+        public int ReadInt() => Reader.ReadInt32();
+        public uint ReadUInt() => Reader.ReadUInt32();
+        public float ReadFloat() => Reader.ReadSingle();
+        public double ReadDouble() => Reader.ReadDouble();
+        public long ReadLong() => Reader.ReadInt64();
+        public ulong ReadULong() => Reader.ReadUInt64();
+        public byte[] ReadBytes(int count) => Reader.ReadBytes(count);
 
-        public sbyte ReadInt8() => base.ReadSByte();
-
-        public byte ReadUInt8() => base.ReadByte();
-
-        public float ReadFloat() => base.ReadSingle();
+        public void Dispose()
+        {
+            Stream.Dispose();
+            Reader.Dispose();
+        }
     }
 }

Scripts/Netcode/Common/Core/PacketWriter.cs

@@ -1,15 +1,38 @@
+using System;
 using System.IO;
 
 namespace GodotModules.Netcode
 {
-    public class PacketWriter : BinaryWriter
+    public class PacketWriter : IDisposable
     {
-        private static MemoryStream stream;
+        public MemoryStream Stream { get; set; }
+        public BinaryWriter Writer { get; set; }
 
-        public PacketWriter() : base(stream = new MemoryStream())
+        public PacketWriter()
         {
+            Stream = new MemoryStream();
+            Writer = new BinaryWriter(Stream);
         }
 
-        public MemoryStream GetStream() => stream;
+        public void Write(byte v) => Writer.Write(v);
+        public void Write(sbyte v) => Writer.Write(v);
+        public void Write(char v) => Writer.Write(v);
+        public void Write(string v) => Writer.Write(v);
+        public void Write(bool v) => Writer.Write(v);
+        public void Write(short v) => Writer.Write(v);
+        public void Write(ushort v) => Writer.Write(v);
+        public void Write(int v) => Writer.Write(v);
+        public void Write(uint v) => Writer.Write(v);
+        public void Write(float v) => Writer.Write(v);
+        public void Write(double v) => Writer.Write(v);
+        public void Write(long v) => Writer.Write(v);
+        public void Write(ulong v) => Writer.Write(v);
+        public void Write(byte[] v) => Writer.Write(v);
+
+        public void Dispose()
+        {
+            Stream.Dispose();
+            Writer.Dispose();
+        }
     }
 }

Scripts/Netcode/Common/Core/ServerPacket.cs

@@ -1,4 +1,5 @@
 using ENet;
+using System.IO;
 
 namespace GodotModules.Netcode
 {
@@ -13,9 +14,8 @@ public ServerPacket(byte opcode, PacketFlags packetFlags, APacket writable = nul
                 writer.Write(opcode);
                 if (writable != null) writable.Write(writer);
 
-                var stream = writer.GetStream();
-                Data = stream.ToArray();
-                Size = stream.Length;
+                Data = writer.Stream.ToArray();
+                Size = writer.Stream.Length;
             }
 
             Opcode = opcode;

Scripts/Netcode/Common/Packet/APacket.cs

@@ -1,3 +1,5 @@
+using System.IO;
+
 namespace GodotModules.Netcode
 {
     public abstract class APacket

Scripts/Netcode/Common/Packet/APacketServerPeerId.cs

@@ -1,10 +1,12 @@
+using System.IO;
+
 namespace GodotModules.Netcode 
 {
     public abstract class APacketServerPeerId : APacketServer
     {
         public uint Id { get; set; }
 
         public override void Write(PacketWriter writer) => writer.Write((ushort)Id);
-        public override void Read(PacketReader reader) => Id = reader.ReadUInt16();
+        public override void Read(PacketReader reader) => Id = reader.ReadUShort();
     }
 }

Scripts/Netcode/Common/SPacketLobbyInfo.cs

@@ -26,11 +26,11 @@ public override void Read(PacketReader reader)
         {
             base.Read(reader);
             IsHost = reader.ReadBool();
-            var count = reader.ReadUInt16();
+            var count = reader.ReadUShort();
             Players = new Dictionary<uint, DataPlayer>();
             for (int i = 0; i < count; i++)
             {
-                var id = reader.ReadUInt16();
+                var id = reader.ReadUShort();
                 var name = reader.ReadString();
 
                 Players.Add(id, new DataPlayer {