themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Using foreach wrong

Browse source
This commit is contained in:
high 2011-08-02 19:45:20 -04:00
parent df196ae632
commit 012b4e3614
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/PacketBufferer.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
@ -25,7 +26,8 @@ namespace TShockAPI
public PacketBufferer() public PacketBufferer()
{ {
BytesPerUpdate = 0xFFFF; BytesPerUpdate = 0xFFFF;
buffers.ForEach(p => p = new PacketBuffer()); for (int i = 0; i < buffers.Length; i++)
buffers[i] = new PacketBuffer();
ServerHooks.SendBytes += ServerHooks_SendBytes; ServerHooks.SendBytes += ServerHooks_SendBytes;
ServerHooks.SocketReset += ServerHooks_SocketReset; ServerHooks.SocketReset += ServerHooks_SocketReset;
@ -56,6 +58,8 @@ namespace TShockAPI
try try
{ {
Debug.WriteLine("Sent: {0} - {1}", i, buffers[i].Packets);
buffers[i].Packets = 0;
Netplay.serverSock[i].tcpClient.Client.Send(buff); Netplay.serverSock[i].tcpClient.Client.Send(buff);
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)
@ -78,6 +82,7 @@ namespace TShockAPI
e.Handled = true; e.Handled = true;
lock (buffers[socket.whoAmI]) lock (buffers[socket.whoAmI])
{ {
buffers[socket.whoAmI].Packets++;
buffers[socket.whoAmI].AddRange(new MemoryStream(buffer, offset, count).ToArray()); buffers[socket.whoAmI].AddRange(new MemoryStream(buffer, offset, count).ToArray());
} }
} }
@ -87,6 +92,7 @@ namespace TShockAPI
public class PacketBuffer : List<byte> public class PacketBuffer : List<byte>
{ {
public int Packets { get; set; }
public byte[] GetBytes(int max) public byte[] GetBytes(int max)
{ {
lock (this) lock (this)