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

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

Browse source
This commit is contained in:
Chris 2020-05-20 18:00:51 +09:30
commit 208afe9a7e
8 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/Bouncer.cs
View file

@ -122,9 +122,9 @@ namespace TShockAPI
if (args.Player.LastNetPosition == Vector2.Zero)
{
TShock.Log.ConsoleDebug("Bouncer / OnPlayerUpdate rejected from (last network position) {0}", args.Player.Name);
args.Handled = true;
return;
TShock.Log.ConsoleInfo("Bouncer / OnPlayerUpdate *would have rejected* from (last network position zero) {0}", args.Player.Name);
// args.Handled = true;
// return;
}
if (!pos.Equals(args.Player.LastNetPosition))
@ -184,6 +184,7 @@ namespace TShockAPI
}
}
args.Player.LastNetPosition = pos;
return;
}

2
TShockAPI/Commands.cs
View file

@ -5012,7 +5012,7 @@ namespace TShockAPI
args.Player.SendSuccessMessage("Your new account has been verified, and the {0}setup system has been turned off.", Specifier);
args.Player.SendSuccessMessage("You can always use the {0}user command to manage players.", Specifier);
args.Player.SendSuccessMessage("The setup system will remain disabled as long as a superadmin exists (even if you delete setup.lock).");
args.Player.SendSuccessMessage("Share your server, talk with other admins, and more on our forums -- https://tshock.co/");
args.Player.SendSuccessMessage("Share your server, talk with other admins, and more on GitHub! -- https://tshock.co/");
args.Player.SendSuccessMessage("Thank you for using TShock for Terraria!");
FileTools.CreateFile(Path.Combine(TShock.SavePath, "setup.lock"));
File.Delete(Path.Combine(TShock.SavePath, "setup-code.txt"));

7
TShockAPI/SqlLog.cs
View file

@ -211,8 +211,11 @@ namespace TShockAPI
/// <param name="message">The message to be written.</param>
public void ConsoleDebug(string message)
{
Console.WriteLine("Debug: " + message);
Write(message, TraceLevel.Verbose);
if (TShock.Config.DebugLogs)
{
Console.WriteLine("Debug: " + message);
Write(message, TraceLevel.Verbose);
}
}
/// <summary>

7
TShockAPI/TextLog.cs
View file

@ -178,8 +178,11 @@ namespace TShockAPI
/// <param name="message">The message to be written.</param>
public void ConsoleDebug(string message)
{
Console.WriteLine("Debug: " + message);
Write(message, TraceLevel.Verbose);
if (TShock.Config.DebugLogs)
{
Console.WriteLine("Debug: " + message);
Write(message, TraceLevel.Verbose);
}
}
/// <summary>