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

Remove remaining obsolete references to Log vs TShock.Log

Browse source
This commit is contained in:
Lucas Nicodemus 2015-02-28 19:42:26 -07:00
parent cbce64f1eb
commit 1be5f6fdc2
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/DB/UserManager.cs
View file

@ -197,7 +197,7 @@ namespace TShockAPI.DB
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.ConsoleError("FetchHashedPasswordAndGroup SQL returned an error: " + ex); TShock.Log.ConsoleError("FetchHashedPasswordAndGroup SQL returned an error: " + ex);
} }
return -1; return -1;
} }
@ -285,7 +285,7 @@ namespace TShockAPI.DB
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Error(ex.ToString()); TShock.Log.Error(ex.ToString());
} }
return null; return null;
} }

8
TShockAPI/Utils.cs
View file

@ -196,7 +196,7 @@ namespace TShockAPI
{ {
TSPlayer.All.SendMessage(msg, red, green, blue); TSPlayer.All.SendMessage(msg, red, green, blue);
TSPlayer.Server.SendMessage(msg, red, green, blue); TSPlayer.Server.SendMessage(msg, red, green, blue);
Log.Info(string.Format("Broadcast: {0}", msg)); TShock.Log.Info(string.Format("Broadcast: {0}", msg));
} }
public void Broadcast(string msg, Color color) public void Broadcast(string msg, Color color)
@ -216,7 +216,7 @@ namespace TShockAPI
{ {
TSPlayer.All.SendMessageFromPlayer(msg, red, green, blue, ply); TSPlayer.All.SendMessageFromPlayer(msg, red, green, blue, ply);
TSPlayer.Server.SendMessage(Main.player[ply].name + ": " + msg, red, green, blue); TSPlayer.Server.SendMessage(Main.player[ply].name + ": " + msg, red, green, blue);
Log.Info(string.Format("Broadcast: {0}", Main.player[ply].name + ": " + msg)); TShock.Log.Info(string.Format("Broadcast: {0}", Main.player[ply].name + ": " + msg));
} }
/// <summary> /// <summary>
@ -227,7 +227,7 @@ namespace TShockAPI
/// <param name="excludedPlayer">The player to not send the message to.</param> /// <param name="excludedPlayer">The player to not send the message to.</param>
public void SendLogs(string log, Color color, TSPlayer excludedPlayer = null) public void SendLogs(string log, Color color, TSPlayer excludedPlayer = null)
{ {
Log.Info(log); TShock.Log.Info(log);
TSPlayer.Server.SendMessage(log, color); TSPlayer.Server.SendMessage(log, color);
foreach (TSPlayer player in TShock.Players) foreach (TSPlayer player in TShock.Players)
{ {
@ -638,7 +638,7 @@ namespace TShockAPI
if (player.IsLoggedIn && saveSSI) if (player.IsLoggedIn && saveSSI)
player.SaveServerCharacter(); player.SaveServerCharacter();
player.Disconnect(string.Format("Kicked: {0}", reason)); player.Disconnect(string.Format("Kicked: {0}", reason));
Log.ConsoleInfo(string.Format("Kicked {0} for : '{1}'", playerName, reason)); TShock.Log.ConsoleInfo(string.Format("Kicked {0} for : '{1}'", playerName, reason));
string verb = force ? "force " : ""; string verb = force ? "force " : "";
if (!silent) if (!silent)
{ {