Back to using ToArray again.

CRBairdUSA · Jul 23, 2016 · 5b520dd · 5b520dd
1 parent a90ace2
commit 5b520dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/MiNET/MiNET/MiNetServer.cs b/src/MiNET/MiNET/MiNetServer.cs
@@ -1086,11 +1086,7 @@ public void SendPackage(PlayerNetworkSession session, Package message)
 				SendDatagram(session, datagram);
 			}
 
-			TraceSend(message);
-
 			message.PutPool();
-
-			//Thread.Sleep(5); // Really important to slow down speed a bit
 		}
 
 		private void SendDatagram(PlayerNetworkSession session, Datagram datagram)
@@ -1167,7 +1163,7 @@ internal static void TraceReceive(Package message, int refNumber = 0)
 			Log.DebugFormat("> Receive: {0}: {1} (0x{0:x2}) #{2}", message.Id, message.GetType().Name, refNumber);
 		}
 
-		private static void TraceSend(Package message)
+		public static void TraceSend(Package message)
 		{
 			if (!Log.IsDebugEnabled) return;
 			//if (!Debugger.IsAttached) return;

diff --git a/src/MiNET/MiNET/Player.cs b/src/MiNET/MiNET/Player.cs
@@ -1793,10 +1793,10 @@ private void SendChunksForKnownPosition()
 			}
 		}
 
-		private static MemoryStream CompressIntoStream(byte[] input, int offset, int length, CompressionLevel compressionLevel,
-			bool writeLen = false)
+		private static MemoryStream CompressIntoStream(byte[] input, int offset, int length, CompressionLevel compressionLevel, bool writeLen = false)
 		{
 			var stream = MiNetServer.MemoryStreamManager.GetStream();
+
 			stream.WriteByte(0x78);
 			switch (compressionLevel)
 			{
@@ -1830,13 +1830,13 @@ private static MemoryStream CompressIntoStream(byte[] input, int offset, int len
 			return stream;
 		}
 
-		public static McpeBatch CreateBatchPacket(byte[] input, int offset, int length, CompressionLevel compressionLevel,
-			bool writeLen = false)
+		public static McpeBatch CreateBatchPacket(byte[] input, int offset, int length, CompressionLevel compressionLevel, bool writeLen = false)
 		{
 			using (var stream = CompressIntoStream(input, offset, length, compressionLevel, writeLen))
 			{
 				var batch = McpeBatch.CreateObject();
-				batch.payload = new PrefixedArray(stream.GetBuffer(), (int)stream.Length);
+				//batch.payload = new PrefixedArray(stream.GetBuffer(), (int)stream.Length);
+				batch.payload = new PrefixedArray(stream.ToArray(), (int)stream.Length);
 				batch.Encode();
 				return batch;
 			}

diff --git a/src/MiNET/MiNET/PlayerNetworkSession.cs b/src/MiNET/MiNET/PlayerNetworkSession.cs
@@ -610,6 +610,8 @@ public void DetectLostConnection()
 
 		public void SendPackage(Package package)
 		{
+			MiNetServer.TraceSend(package);
+
 			if (package == null) return;
 
 			if (State == ConnectionState.Unconnected)