diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 9095135c..70450199 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -1266,16 +1266,16 @@ namespace TShockAPI { if (TShock.Config.Settings.KickOnProjectileThresholdBroken) { - args.Player.Kick(GetString("Projectile update threshold exceeded {0}.", TShock.Config.Settings.ProjectileThreshold)); + args.Player.Kick(GetString("Projectile create threshold exceeded {0}.", TShock.Config.Settings.ProjectileThreshold)); } else { - args.Player.Disable(GetString("Reached projectile update threshold."), DisableFlags.WriteToLogAndConsole); + args.Player.Disable(GetString("Reached projectile create threshold."), DisableFlags.WriteToLogAndConsole); args.Player.RemoveProjectile(ident, owner); } - TShock.Log.ConsoleDebug(GetString("Bouncer / OnNewProjectile rejected from projectile update threshold from {0} {1}/{2}", args.Player.Name, args.Player.ProjectileThreshold, TShock.Config.Settings.ProjectileThreshold)); - TShock.Log.ConsoleDebug(GetString("If this player wasn't hacking, please report the projectile update threshold they were disabled for to TShock so we can improve this!")); + TShock.Log.ConsoleDebug(GetString("Bouncer / OnNewProjectile rejected from projectile create threshold from {0} {1}/{2}", args.Player.Name, args.Player.ProjectileThreshold, TShock.Config.Settings.ProjectileThreshold)); + TShock.Log.ConsoleDebug(GetString("If this player wasn't hacking, please report the projectile create threshold they were disabled for to TShock so we can improve this!")); args.Handled = true; return; } diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index af1251ce..51a15d20 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -6455,7 +6455,10 @@ namespace TShockAPI if (time < 0 || time > timeLimit) time = timeLimit; target.SetBuff(id, time * 60); - user.SendSuccessMessage(GetString($"You have buffed {(target == user ? GetString("yourself") : target.Name)} with {TShock.Utils.GetBuffName(id)} ({TShock.Utils.GetBuffDescription(id)}) for {time} seconds!")); + if (target == user) + user.SendSuccessMessage(GetString($"You buffed yourself with {TShock.Utils.GetBuffName(id)} ({TShock.Utils.GetBuffDescription(id)}) for {time} seconds.")); + else + target.SendSuccessMessage(GetString($"You have buffed {user.Name} with {TShock.Utils.GetBuffName(id)} ({TShock.Utils.GetBuffDescription(id)}) for {time} seconds!")); if (!args.Silent && target != user) target.SendSuccessMessage(GetString($"{user.Name} has buffed you with {TShock.Utils.GetBuffName(id)} ({TShock.Utils.GetBuffDescription(id)}) for {time} seconds!")); } diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 244914b6..553ab9d9 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -1921,9 +1921,9 @@ namespace TShockAPI if (!silent) { if (string.IsNullOrWhiteSpace(adminUserName)) - TShock.Utils.Broadcast(GetString("{0} was kicked for '{1}'", Name, reason.ToLower()), Color.Green); + TShock.Utils.Broadcast(GetString("{0} was kicked for '{1}'", Name, reason), Color.Green); else - TShock.Utils.Broadcast(GetString("{0} kicked {1} for '{2}'", adminUserName, Name, reason.ToLower()), Color.Green); + TShock.Utils.Broadcast(GetString("{0} kicked {1} for '{2}'", adminUserName, Name, reason), Color.Green); } return true; }