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

Fix calls in TShock.cs and TSPlayer.cs

Browse source
This commit is contained in:
Enerdy 2015-07-04 14:18:17 +01:00
parent 84c6d97f6d
commit b7aaf4092c
2 changed files with 143 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

40
TShockAPI/TSPlayer.cs
View file

@ -339,8 +339,8 @@ namespace TShockAPI
{ {
get get
{ {
return RealPlayer && return RealPlayer
(Netplay.serverSock[Index] != null && Netplay.serverSock[Index].active && !Netplay.serverSock[Index].kill); && (Netplay.Clients[Index] != null && Netplay.Clients[Index].IsActive && !Netplay.Clients[Index].PendingTermination);
} }
} }
@ -354,8 +354,8 @@ namespace TShockAPI
public int State public int State
{ {
get { return Netplay.serverSock[Index].state; } get { return Netplay.Clients[Index].State; }
set { Netplay.serverSock[Index].state = value; } set { Netplay.Clients[Index].State = value; }
} }
/// <summary> /// <summary>
@ -363,7 +363,7 @@ namespace TShockAPI
/// </summary> /// </summary>
public string UUID public string UUID
{ {
get { return RealPlayer ? Netplay.serverSock[Index].clientUUID : ""; } get { return RealPlayer ? Netplay.Clients[Index].ClientUUID : ""; }
} }
/// <summary> /// <summary>
@ -375,10 +375,8 @@ namespace TShockAPI
{ {
if (string.IsNullOrEmpty(CacheIP)) if (string.IsNullOrEmpty(CacheIP))
return return
CacheIP = CacheIP = RealPlayer ? (Netplay.Clients[Index].Socket.IsConnected()
RealPlayer ? TShock.Utils.GetRealIP(Netplay.Clients[Index].Socket.GetRemoteAddress().ToString())
? (Netplay.serverSock[Index].tcpClient.Connected
? TShock.Utils.GetRealIP(Netplay.serverSock[Index].tcpClient.Client.RemoteEndPoint.ToString())
: "") : "")
: ""; : "";
else else
@ -521,7 +519,7 @@ namespace TShockAPI
TilesDestroyed = new Dictionary<Vector2, Tile>(); TilesDestroyed = new Dictionary<Vector2, Tile>();
TilesCreated = new Dictionary<Vector2, Tile>(); TilesCreated = new Dictionary<Vector2, Tile>();
Index = -1; Index = -1;
FakePlayer = new Player {name = playerName, whoAmi = -1}; FakePlayer = new Player {name = playerName, whoAmI = -1};
Group = Group.DefaultGroup; Group = Group.DefaultGroup;
AwaitingResponse = new Dictionary<string, Action<object>>(); AwaitingResponse = new Dictionary<string, Action<object>>();
} }
@ -533,11 +531,11 @@ namespace TShockAPI
public virtual void Flush() public virtual void Flush()
{ {
var sock = Netplay.serverSock[Index]; var client = Netplay.Clients[Index];
if (sock == null) if (client == null)
return; return;
TShock.PacketBuffer.Flush(sock); TShock.PacketBuffer.Flush(client);
} }
@ -573,13 +571,13 @@ namespace TShockAPI
SendTileSquare((int) (x/16), (int) (y/16), 15); SendTileSquare((int) (x/16), (int) (y/16), 15);
TPlayer.Teleport(new Vector2(x, y), style); TPlayer.Teleport(new Vector2(x, y), style);
NetMessage.SendData((int)PacketTypes.Teleport, -1, -1, "", 0, TPlayer.whoAmi, x, y, style); NetMessage.SendData((int)PacketTypes.Teleport, -1, -1, "", 0, TPlayer.whoAmI, x, y, style);
return true; return true;
} }
public void Heal(int health = 600) public void Heal(int health = 600)
{ {
NetMessage.SendData((int)PacketTypes.PlayerHealOther, -1, -1, "", this.TPlayer.whoAmi, health); NetMessage.SendData((int)PacketTypes.PlayerHealOther, -1, -1, "", this.TPlayer.whoAmI, health);
} }
public void Spawn() public void Spawn()
@ -838,7 +836,8 @@ namespace TShockAPI
NetMessage.SendData((int) msgType, Index, -1, text, number, number2, number3, number4, number5); NetMessage.SendData((int) msgType, Index, -1, text, number, number2, number3, number4, number5);
} }
public virtual void SendDataFromPlayer(PacketTypes msgType, int ply, string text = "", float number2 = 0f, float number3 = 0f, float number4 = 0f, int number5 = 0) public virtual void SendDataFromPlayer(PacketTypes msgType, int ply, string text = "", float number2 = 0f,
float number3 = 0f, float number4 = 0f, int number5 = 0)
{ {
if (RealPlayer && !ConnectionAlive) if (RealPlayer && !ConnectionAlive)
return; return;
@ -850,7 +849,8 @@ namespace TShockAPI
{ {
if (!RealPlayer || !ConnectionAlive) if (!RealPlayer || !ConnectionAlive)
return; return;
NetMessage.SendBytes(Netplay.serverSock[Index], data, 0, data.Length, Netplay.serverSock[Index].ServerWriteCallBack, Netplay.serverSock[Index].networkStream);
Netplay.Clients[Index].Socket.AsyncSend(data, 0, data.Length, Netplay.Clients[Index].ServerWriteCallBack);
} }
/// <summary> /// <summary>
@ -1089,7 +1089,7 @@ namespace TShockAPI
public Color? shoeColor; public Color? shoeColor;
public Color? skinColor; public Color? skinColor;
public Color? eyeColor; public Color? eyeColor;
public BitsByte? hideVisuals; public bool[] hideVisuals;
public int questsCompleted; public int questsCompleted;
public PlayerData(TSPlayer player) public PlayerData(TSPlayer player)
@ -1200,9 +1200,9 @@ namespace TShockAPI
player.TPlayer.eyeColor = this.eyeColor.Value; player.TPlayer.eyeColor = this.eyeColor.Value;
if (this.hideVisuals != null) if (this.hideVisuals != null)
player.TPlayer.hideVisual = this.hideVisuals.Value; player.TPlayer.hideVisual = this.hideVisuals;
else else
player.TPlayer.hideVisual.ClearAll(); player.TPlayer.hideVisual = new bool[player.TPlayer.hideVisual.Length];
for (int i = 0; i < NetItem.MaxInventory; i++) for (int i = 0; i < NetItem.MaxInventory; i++)
{ {

120
TShockAPI/TShock.cs
View file

@ -280,7 +280,7 @@ namespace TShockAPI
TileBans = new TileManager(DB); TileBans = new TileManager(DB);
RememberedPos = new RememberedPosManager(DB); RememberedPos = new RememberedPosManager(DB);
CharacterDB = new CharacterManager(DB); CharacterDB = new CharacterManager(DB);
RestApi = new SecureRest(Netplay.serverListenIP, Config.RestApiPort); RestApi = new SecureRest(Netplay.ServerIP, Config.RestApiPort);
RestApi.Port = Config.RestApiPort; RestApi.Port = Config.RestApiPort;
RestManager = new RestManager(RestApi); RestManager = new RestManager(RestApi);
RestManager.RegisterRestfulCommands(); RestManager.RegisterRestfulCommands();
@ -442,14 +442,14 @@ namespace TShockAPI
/// <param name="args">args - The NameCollisionEventArgs object.</param> /// <param name="args">args - The NameCollisionEventArgs object.</param>
private void NetHooks_NameCollision(NameCollisionEventArgs args) private void NetHooks_NameCollision(NameCollisionEventArgs args)
{ {
string ip = Utils.GetRealIP(Netplay.serverSock[args.Who].tcpClient.Client.RemoteEndPoint.ToString()); string ip = Utils.GetRealIP(Netplay.Clients[args.Who].Socket.GetRemoteAddress().ToString());
var player = Players.First(p => p != null && p.Name == args.Name && p.Index != args.Who); var player = Players.First(p => p != null && p.Name == args.Name && p.Index != args.Who);
if (player != null) if (player != null)
{ {
if (player.IP == ip) if (player.IP == ip)
{ {
Netplay.serverSock[player.Index].kill = true; Netplay.Clients[player.Index].PendingTermination = true;
args.Handled = true; args.Handled = true;
return; return;
} }
@ -458,7 +458,7 @@ namespace TShockAPI
var ips = JsonConvert.DeserializeObject<List<string>>(player.User.KnownIps); var ips = JsonConvert.DeserializeObject<List<string>>(player.User.KnownIps);
if (ips.Contains(ip)) if (ips.Contains(ip))
{ {
Netplay.serverSock[player.Index].kill = true; Netplay.Clients[player.Index].PendingTermination = true;
args.Handled = true; args.Handled = true;
} }
} }
@ -506,13 +506,13 @@ namespace TShockAPI
e.ExceptionObject.ToString().Contains("Terraria.Netplay.ServerLoop")) e.ExceptionObject.ToString().Contains("Terraria.Netplay.ServerLoop"))
{ {
var sb = new List<string>(); var sb = new List<string>();
for (int i = 0; i < Netplay.serverSock.Length; i++) for (int i = 0; i < Netplay.Clients.Length; i++)
{ {
if (Netplay.serverSock[i] == null) if (Netplay.Clients[i] == null)
{ {
sb.Add("Sock[" + i + "]"); sb.Add("Client[" + i + "]");
} }
else if (Netplay.serverSock[i].tcpClient == null) else if (Netplay.Clients[i].Socket == null)
{ {
sb.Add("Tcp[" + i + "]"); sb.Add("Tcp[" + i + "]");
} }
@ -537,7 +537,7 @@ namespace TShockAPI
string path; string path;
for (int i = 0; i < parms.Length; i++) for (int i = 0; i < parms.Length; i++)
{ {
switch(parms[i].ToLower()) switch (parms[i].ToLower())
{ {
case "-configpath": case "-configpath":
path = parms[++i]; path = parms[++i];
@ -591,11 +591,11 @@ namespace TShockAPI
{ {
for (int i = 0; i < parms.Length; i++) for (int i = 0; i < parms.Length; i++)
{ {
switch(parms[i].ToLower()) switch (parms[i].ToLower())
{ {
case "-port": case "-port":
int port = Convert.ToInt32(parms[++i]); int port = Convert.ToInt32(parms[++i]);
Netplay.serverPort = port; Netplay.ListenPort = port;
Config.ServerPort = port; Config.ServerPort = port;
OverridePort = true; OverridePort = true;
Log.ConsoleInfo("Port overridden by startup argument. Set to " + port); Log.ConsoleInfo("Port overridden by startup argument. Set to " + port);
@ -632,7 +632,7 @@ namespace TShockAPI
SetConsoleTitle(false); SetConsoleTitle(false);
if (!File.Exists(Path.Combine(SavePath, "auth.lck")) && !File.Exists(Path.Combine(SavePath, "authcode.txt"))) if (!File.Exists(Path.Combine(SavePath, "auth.lck")) && !File.Exists(Path.Combine(SavePath, "authcode.txt")))
{ {
var r = new Random((int) DateTime.Now.ToBinary()); var r = new Random((int)DateTime.Now.ToBinary());
AuthToken = r.Next(100000, 10000000); AuthToken = r.Next(100000, 10000000);
Console.ForegroundColor = ConsoleColor.Yellow; Console.ForegroundColor = ConsoleColor.Yellow;
Console.WriteLine("TShock Notice: To become SuperAdmin, join the game and type {0}auth {1}", Commands.Specifier, AuthToken); Console.WriteLine("TShock Notice: To become SuperAdmin, join the game and type {0}auth {1}", Commands.Specifier, AuthToken);
@ -796,13 +796,13 @@ namespace TShockAPI
player.TilePlaceThreshold = 0; player.TilePlaceThreshold = 0;
} }
if (player.RecentFuse >0) if (player.RecentFuse > 0)
player.RecentFuse--; player.RecentFuse--;
if ((Main.ServerSideCharacter) && (player.TPlayer.SpawnX > 0) &&(player.sX != player.TPlayer.SpawnX)) if ((Main.ServerSideCharacter) && (player.TPlayer.SpawnX > 0) && (player.sX != player.TPlayer.SpawnX))
{ {
player.sX=player.TPlayer.SpawnX; player.sX = player.TPlayer.SpawnX;
player.sY=player.TPlayer.SpawnY; player.sY = player.TPlayer.SpawnY;
} }
if ((Main.ServerSideCharacter) && (player.sX > 0) && (player.sY > 0) && (player.TPlayer.SpawnX < 0)) if ((Main.ServerSideCharacter) && (player.sX > 0) && (player.sY > 0) && (player.TPlayer.SpawnX < 0))
@ -811,12 +811,12 @@ namespace TShockAPI
player.TPlayer.SpawnY = player.sY; player.TPlayer.SpawnY = player.sY;
} }
if (player.RPPending >0) if (player.RPPending > 0)
{ {
if (player.RPPending == 1) if (player.RPPending == 1)
{ {
var pos = RememberedPos.GetLeavePos(player.Name, player.IP); var pos = RememberedPos.GetLeavePos(player.Name, player.IP);
player.Teleport(pos.X*16, pos.Y*16 ); player.Teleport(pos.X * 16, pos.Y * 16);
player.RPPending = 0; player.RPPending = 0;
} }
else else
@ -919,7 +919,7 @@ namespace TShockAPI
Console.Title = string.Format("{0}{1}/{2} @ {3}:{4} (TShock for Terraria v{5})", Console.Title = string.Format("{0}{1}/{2} @ {3}:{4} (TShock for Terraria v{5})",
!string.IsNullOrWhiteSpace(Config.ServerName) ? Config.ServerName + " - " : "", !string.IsNullOrWhiteSpace(Config.ServerName) ? Config.ServerName + " - " : "",
empty ? 0 : Utils.ActivePlayers(), empty ? 0 : Utils.ActivePlayers(),
Config.MaxSlots, Netplay.serverListenIP, Netplay.serverPort, Version); Config.MaxSlots, Netplay.ServerIPText, Netplay.ListenPort, Version);
} }
/// <summary>OnHardUpdate - Fired when a hardmode tile update event happens.</summary> /// <summary>OnHardUpdate - Fired when a hardmode tile update event happens.</summary>
@ -1058,7 +1058,7 @@ namespace TShockAPI
else if (ts.Days > 0) else if (ts.Days > 0)
{ {
player.Disconnect(String.Format("You are banned for {0} day{1} and {2} hour{3}: {4}", player.Disconnect(String.Format("You are banned for {0} day{1} and {2} hour{3}: {4}",
ts.Days, ts.Days == 1 ? "": "s", ts.Hours, ts.Hours == 1 ? "" : "s", ban.Reason)); ts.Days, ts.Days == 1 ? "" : "s", ts.Hours, ts.Hours == 1 ? "" : "s", ban.Reason));
} }
else if (ts.Hours > 0) else if (ts.Hours > 0)
{ {
@ -1102,7 +1102,7 @@ namespace TShockAPI
if (Config.RememberLeavePos && !tsplr.LoginHarassed) if (Config.RememberLeavePos && !tsplr.LoginHarassed)
{ {
RememberedPos.InsertLeavePos(tsplr.Name, tsplr.IP, (int) (tsplr.X/16), (int) (tsplr.Y/16)); RememberedPos.InsertLeavePos(tsplr.Name, tsplr.IP, (int)(tsplr.X / 16), (int)(tsplr.Y / 16));
} }
if (tsplr.tempGroupTimer != null) if (tsplr.tempGroupTimer != null)
@ -1248,7 +1248,7 @@ namespace TShockAPI
PacketTypes type = e.MsgID; PacketTypes type = e.MsgID;
Debug.WriteLine("Recv: {0:X}: {2} ({1:XX})", e.Msg.whoAmI, (byte) type, type); Debug.WriteLine("Recv: {0:X}: {2} ({1:XX})", e.Msg.whoAmI, (byte)type, type);
var player = Players[e.Msg.whoAmI]; var player = Players[e.Msg.whoAmI];
if (player == null || !player.ConnectionAlive) if (player == null || !player.ConnectionAlive)
@ -1263,8 +1263,8 @@ namespace TShockAPI
return; return;
} }
if ((player.State < 10 || player.Dead) && (int) type > 12 && (int) type != 16 && (int) type != 42 && (int) type != 50 && if ((player.State < 10 || player.Dead) && (int)type > 12 && (int)type != 16 && (int)type != 42 && (int)type != 50 &&
(int) type != 38 && (int) type != 21 && (int) type != 22) (int)type != 38 && (int)type != 21 && (int)type != 22)
{ {
e.Handled = true; e.Handled = true;
return; return;
@ -1375,75 +1375,37 @@ namespace TShockAPI
e.Object.SetDefaults(0); e.Object.SetDefaults(0);
} }
/// <summary>
/// Send bytes to client using packetbuffering if available
/// </summary>
/// <param name="client">socket to send to</param>
/// <param name="bytes">bytes to send</param>
/// <returns>False on exception</returns>
public static bool SendBytes(ServerSock client, byte[] bytes)
{
if (PacketBuffer != null)
{
PacketBuffer.BufferBytes(client, bytes);
return true;
}
return SendBytesBufferless(client, bytes);
}
/// <summary>
/// Send bytes to a client ignoring the packet buffer
/// </summary>
/// <param name="client">socket to send to</param>
/// <param name="bytes">bytes to send</param>
/// <returns>False on exception</returns>
public static bool SendBytesBufferless(ServerSock client, byte[] bytes)
{
try
{
if (client.tcpClient.Connected)
client.networkStream.Write(bytes, 0, bytes.Length);
return true;
}
catch (Exception ex)
{
Log.Warn("This is a normal exception");
Log.Warn(ex.ToString());
}
return false;
}
/// <summary>NetHooks_SendData - Fired when the server sends data.</summary> /// <summary>NetHooks_SendData - Fired when the server sends data.</summary>
/// <param name="e">e - The SendDataEventArgs object.</param> /// <param name="e">e - The SendDataEventArgs object.</param>
private void NetHooks_SendData(SendDataEventArgs e) private void NetHooks_SendData(SendDataEventArgs e)
{ {
if (e.MsgId == PacketTypes.Disconnect) if (e.MsgId == PacketTypes.Disconnect)
{ {
Action<ServerSock, string> senddisconnect = (sock, str) => Action<RemoteClient, string> disconnect = (client, str) =>
{ {
if (sock == null || !sock.active) if (client == null || !client.IsActive || client.Socket.IsConnected())
return; return;
sock.kill = true;
using (var ms = new MemoryStream()) using (var ms = new MemoryStream())
{ {
new DisconnectMsg { Reason = str }.PackFull(ms); var msg = new DisconnectMsg() { Reason = str };
SendBytesBufferless(sock, ms.ToArray()); msg.PackFull(ms);
client.Socket.AsyncSend(ms.ToArray(), 0, (int)ms.Length, client.ServerWriteCallBack);
client.Socket.Close();
} }
}; };
if (e.remoteClient != -1) if (e.remoteClient != -1)
{ {
senddisconnect(Netplay.serverSock[e.remoteClient], e.text); disconnect(Netplay.Clients[e.remoteClient], e.text);
} }
else else
{ {
for (int i = 0; i < Netplay.serverSock.Length; i++) for (int i = 0; i < Netplay.Clients.Length; i++)
{ {
if (e.ignoreClient != -1 && e.ignoreClient == i) if (e.ignoreClient != -1 && e.ignoreClient == i)
continue; continue;
senddisconnect(Netplay.serverSock[i], e.text); disconnect(Netplay.Clients[i], e.text);
} }
} }
e.Handled = true; e.Handled = true;
@ -1562,7 +1524,7 @@ namespace TShockAPI
} }
else else
{ {
Main.invasionSize = 100 + (Config.InvasionMultiplier*Utils.ActivePlayers()); Main.invasionSize = 100 + (Config.InvasionMultiplier * Utils.ActivePlayers());
} }
Main.invasionWarn = 0; Main.invasionWarn = 0;
@ -1586,7 +1548,7 @@ namespace TShockAPI
KillCount++; KillCount++;
Random r = new Random(); Random r = new Random();
int random = r.Next(5); int random = r.Next(5);
if (KillCount%100 == 0) if (KillCount % 100 == 0)
{ {
switch (random) switch (random)
{ {
@ -1828,8 +1790,8 @@ namespace TShockAPI
{ {
float num2 = value1.X - value2.X; float num2 = value1.X - value2.X;
float num = value1.Y - value2.Y; float num = value1.Y - value2.Y;
float num3 = (num2*num2) + (num*num); float num3 = (num2 * num2) + (num * num);
return (float) Math.Sqrt(num3); return (float)Math.Sqrt(num3);
} }
/// <summary>HackedInventory - Checks to see if a user has a hacked inventory. In addition, messages players the result.</summary> /// <summary>HackedInventory - Checks to see if a user has a hacked inventory. In addition, messages players the result.</summary>
@ -1861,7 +1823,7 @@ namespace TShockAPI
} }
} }
} }
else if(i < (NetItem.MaxInventory - (NetItem.ArmorSlots + NetItem.DyeSlots))) else if (i < (NetItem.MaxInventory - (NetItem.ArmorSlots + NetItem.DyeSlots)))
{ {
Item item = new Item(); Item item = new Item();
var index = i - (NetItem.MaxInventory - (NetItem.ArmorSlots + NetItem.DyeSlots)); var index = i - (NetItem.MaxInventory - (NetItem.ArmorSlots + NetItem.DyeSlots));
@ -1925,16 +1887,14 @@ namespace TShockAPI
} }
if (!OverridePort) if (!OverridePort)
{ {
Netplay.serverPort = file.ServerPort; Netplay.ListenPort = file.ServerPort;
} }
if (file.MaxSlots > 235) if (file.MaxSlots > 235)
file.MaxSlots = 235; file.MaxSlots = 235;
Main.maxNetPlayers = file.MaxSlots + 20; Main.maxNetPlayers = file.MaxSlots + 20;
Netplay.password = ""; Netplay.ServerPassword = "";
Netplay.spamCheck = false; Netplay.spamCheck = false;
Utils.HashAlgo = file.HashAlgorithm;
} }
} }
} }