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

Update methods using deprecated SendData code and Logs

Browse source
This commit is contained in:
Enerdy 2015-02-28 12:57:26 +00:00
parent 50447ad235
commit 825de3fe73
4 changed files with 102 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

46
TShockAPI/TSPlayer.cs
View file

@ -376,24 +376,24 @@ namespace TShockAPI
/// Saves the player's inventory to SSI
/// </summary>
/// <returns>bool - True/false if it saved successfully</returns>
public bool SaveServerCharacter()
{
if (!Main.ServerSideCharacter)
{
return false;
}
try
{
PlayerData.CopyCharacter(this);
TShock.CharacterDB.InsertPlayerData(this);
return true;
} catch (Exception e)
{
Log.Error(e.Message);
return false;
}
}
public bool SaveServerCharacter()
{
if (!Main.ServerSideCharacter)
{
return false;
}
try
{
PlayerData.CopyCharacter(this);
TShock.CharacterDB.InsertPlayerData(this);
return true;
}
catch (Exception e)
{
TShock.Log.Error(e.Message);
return false;
}
}
/// <summary>
/// Sends the players server side character to client
@ -412,7 +412,7 @@ namespace TShockAPI
}
catch (Exception e)
{
Log.Error(e.Message);
TShock.Log.Error(e.Message);
return false;
}
@ -707,7 +707,7 @@ namespace TShockAPI
}
catch (Exception ex)
{
Log.Error(ex.ToString());
TShock.Log.Error(ex.ToString());
}
return false;
}
@ -836,11 +836,11 @@ namespace TShockAPI
{
if (displayConsole)
{
Log.ConsoleInfo(string.Format("Player {0} has been disabled for {1}.", Name, reason));
TShock.Log.ConsoleInfo("Player {0} has been disabled for {1}.", Name, reason);
}
else
{
Log.Info("Player {0} has been disabled for {1}.", Name, reason);
TShock.Log.Info("Player {0} has been disabled for {1}.", Name, reason);
}
LastDisableNotification = DateTime.UtcNow;
}
@ -857,7 +857,7 @@ namespace TShockAPI
var time2 = (int) time;
var launch = DateTime.UtcNow;
var startname = Name;
SendMessage("You are now being annoyed.", Color.Red);
SendInfoMessage("You are now being annoyed.");
while ((DateTime.UtcNow - launch).TotalSeconds < time2 && startname == Name)
{
SendData(PacketTypes.NpcSpecial, number: Index, number2: 2f);