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

Merge pull request #2697 from Pryaxis/banondeath

Browse source 
Fix hard/mediumcore ban on death when settings are enabled.
This commit is contained in:
Chris 2022-10-07 19:35:07 +10:30 • committed by GitHub
commit a2245b210a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -24,6 +24,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* SetDefaultsEventArgs now includes a nullable ItemVariant instance. (@SignatureBeef) * SetDefaultsEventArgs now includes a nullable ItemVariant instance. (@SignatureBeef)
* Use a string interpolation and escape single quotes when escaping tables (@drunderscore) * Use a string interpolation and escape single quotes when escaping tables (@drunderscore)
* Removed obsolete resource files `TShockAPI/Resources.resx` and `TShockAPI/Resources.Designer.cs`. (@Arthri) * Removed obsolete resource files `TShockAPI/Resources.resx` and `TShockAPI/Resources.Designer.cs`. (@Arthri)
* Fixed hardcore and mediumcore not banning on death when settings are enabled. This also alters the TSPlayer.Ban method to remove the force option which is no longer needed. (@SignatureBeef)
* Plugins and ./bin dependencies are now loaded relative to the launcher, this improves the use of startup files (@SignatureBeef) * Plugins and ./bin dependencies are now loaded relative to the launcher, this improves the use of startup files (@SignatureBeef)
## TShock 4.5.18 ## TShock 4.5.18

2
TShockAPI/GetDataHandlers.cs
View file

@ -4157,7 +4157,7 @@ namespace TShockAPI
if (shouldBan) if (shouldBan)
{ {
if (!args.Player.Ban(banReason, false, "TShock")) if (!args.Player.Ban(banReason, "TShock"))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandlePlayerKillMeV2 kicked with difficulty {0} {1}", args.Player.Name, args.TPlayer.difficulty); TShock.Log.ConsoleDebug("GetDataHandlers / HandlePlayerKillMeV2 kicked with difficulty {0} {1}", args.Player.Name, args.TPlayer.difficulty);
args.Player.Kick("You died! Normally, you'd be banned.", true, true); args.Player.Kick("You died! Normally, you'd be banned.", true, true);

14
TShockAPI/TSPlayer.cs
View file

@ -1701,14 +1701,12 @@ namespace TShockAPI
/// Bans and disconnects the player from the server. /// Bans and disconnects the player from the server.
/// </summary> /// </summary>
/// <param name="reason">The reason to be displayed to the server.</param> /// <param name="reason">The reason to be displayed to the server.</param>
/// <param name="force">If the ban should bypass immunity to ban checks.</param>
/// <param name="adminUserName">The player who initiated the ban.</param> /// <param name="adminUserName">The player who initiated the ban.</param>
public bool Ban(string reason, bool force = false, string adminUserName = null) public bool Ban(string reason, string adminUserName = null)
{ {
if (!ConnectionAlive) if (!ConnectionAlive)
return true; return true;
if (force)
{
TShock.Bans.InsertBan($"{Identifier.IP}{IP}", reason, adminUserName, DateTime.UtcNow, DateTime.MaxValue); TShock.Bans.InsertBan($"{Identifier.IP}{IP}", reason, adminUserName, DateTime.UtcNow, DateTime.MaxValue);
TShock.Bans.InsertBan($"{Identifier.UUID}{UUID}", reason, adminUserName, DateTime.UtcNow, DateTime.MaxValue); TShock.Bans.InsertBan($"{Identifier.UUID}{UUID}", reason, adminUserName, DateTime.UtcNow, DateTime.MaxValue);
if (Account != null) if (Account != null)
@ -1717,15 +1715,13 @@ namespace TShockAPI
} }
Disconnect(string.Format("Banned: {0}", reason)); Disconnect(string.Format("Banned: {0}", reason));
string verb = force ? "force " : "";
if (string.IsNullOrWhiteSpace(adminUserName)) if (string.IsNullOrWhiteSpace(adminUserName))
TSPlayer.All.SendInfoMessage("{0} was {1}banned for '{2}'.", Name, verb, reason); TSPlayer.All.SendInfoMessage("{0} was banned for '{1}'.", Name, reason);
else else
TSPlayer.All.SendInfoMessage("{0} {1}banned {2} for '{3}'.", adminUserName, verb, Name, reason); TSPlayer.All.SendInfoMessage("{0} banned {1} for '{2}'.", adminUserName, Name, reason);
return true; return true;
} }
return false;
}
/// <summary> /// <summary>
/// Sends the player an error message stating that more than one match was found /// Sends the player an error message stating that more than one match was found