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

Merge branch 'general-devel' of github.com:TShock/TShock

Browse source
This commit is contained in:
Steven French 2011-07-04 22:09:31 +12:00
commit a985b5976a
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/TShock.cs
View file

@ -470,10 +470,13 @@ namespace TShockAPI
writer.Write(length); writer.Write(length);
NetMessage.buffer[e.remoteClient].writeBuffer = stream.GetBuffer(); NetMessage.buffer[e.remoteClient].writeBuffer = stream.GetBuffer();
try try
{
if (Netplay.serverSock[e.remoteClient].tcpClient.Connected)
{ {
NetMessage.buffer[e.remoteClient].spamCount++; NetMessage.buffer[e.remoteClient].spamCount++;
Netplay.serverSock[e.remoteClient].networkStream.BeginWrite(NetMessage.buffer[e.remoteClient].writeBuffer, 0, (int)stream.Length, new AsyncCallback(Netplay.serverSock[e.remoteClient].ServerWriteCallBack), Netplay.serverSock[e.remoteClient].networkStream); Netplay.serverSock[e.remoteClient].networkStream.BeginWrite(NetMessage.buffer[e.remoteClient].writeBuffer, 0, (int)stream.Length, new AsyncCallback(Netplay.serverSock[e.remoteClient].ServerWriteCallBack), Netplay.serverSock[e.remoteClient].networkStream);
} }
}
catch { } catch { }
NetMessage.buffer[e.remoteClient].writeLocked = false; NetMessage.buffer[e.remoteClient].writeLocked = false;
e.Handled = true; e.Handled = true;
@ -503,6 +506,7 @@ namespace TShockAPI
if (Config.AlwaysPvP) if (Config.AlwaysPvP)
{ {
player.SetPvP(true); player.SetPvP(true);
player.SendMessage("PvP is forced! Enable PvP else you can't deal damage to other people. (People can kill you)", Color.Red);
} }
if (player.Group.HasPermission("causeevents") && Config.InfiniteInvasion) if (player.Group.HasPermission("causeevents") && Config.InfiniteInvasion)
{ {