From fd83748b9f9c553ce3092c3a750986291b8c0c9e Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 27 Apr 2018 10:19:26 +0300 Subject: [PATCH] Change banning admin name for hardcore bans to "TShock" Also added some comments and formatting --- TShockAPI/GetDataHandlers.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index fb763465..02be7f7f 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2380,17 +2380,17 @@ namespace TShockAPI } } - if (args.TPlayer.difficulty != 0) + // Handle kicks/bans on mediumcore/hardcore deaths. + if (args.TPlayer.difficulty != 0) // Player is not softcore { bool mediumcore = args.TPlayer.difficulty == 1; - bool shouldBan = mediumcore ? TShock.Config.BanOnMediumcoreDeath : TShock.Config.BanOnHardcoreDeath; - bool shouldKick = mediumcore ? TShock.Config.KickOnMediumcoreDeath : TShock.Config.KickOnHardcoreDeath; - string banReason = mediumcore ? TShock.Config.MediumcoreBanReason : TShock.Config.HardcoreBanReason; - string kickReason = mediumcore ? TShock.Config.MediumcoreKickReason : TShock.Config.HardcoreKickReason; - string banAdminName = mediumcore ? "mediumcore-death" : "hardcore-death"; + bool shouldBan = mediumcore ? TShock.Config.BanOnMediumcoreDeath : TShock.Config.BanOnHardcoreDeath; + bool shouldKick = mediumcore ? TShock.Config.KickOnMediumcoreDeath : TShock.Config.KickOnHardcoreDeath; + string banReason = mediumcore ? TShock.Config.MediumcoreBanReason : TShock.Config.HardcoreBanReason; + string kickReason = mediumcore ? TShock.Config.MediumcoreKickReason : TShock.Config.HardcoreKickReason; if(shouldBan) { - if (!args.Player.Ban(banReason, false, banAdminName)) + if (!args.Player.Ban(banReason, false, "TShock")) args.Player.Kick("You died! Normally, you'd be banned.", true, true); } else if(shouldKick) {