From 68c650f4fa05a93b92e361067d7665f83b6bb07f Mon Sep 17 00:00:00 2001 From: stacey <57187883+moisterrific@users.noreply.github.com> Date: Wed, 12 May 2021 21:36:26 -0400 Subject: [PATCH] More minor fixes Reverted default (when no duration is specified) buff duration to 60s, added formula instead of hard coding max duration as per Quake's recommendation, made error message more self-explanatory --- TShockAPI/Commands.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 66fce497..b03ad31e 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -5961,11 +5961,12 @@ namespace TShockAPI { if (args.Parameters.Count < 1 || args.Parameters.Count > 2) { - args.Player.SendErrorMessage("Invalid syntax! Proper syntax: {0}buff [time in seconds]", Specifier); + args.Player.SendErrorMessage("Invalid syntax! Proper syntax: {0}buff [optional: time in seconds]", Specifier); return; } int id = 0; - int time = 35791393; + int time = 60; + var timeLimit = (int.MaxValue / 60) - 1 if (!int.TryParse(args.Parameters[0], out id)) { var found = TShock.Utils.GetBuffByName(args.Parameters[0]); @@ -5986,8 +5987,8 @@ namespace TShockAPI if (id > 0 && id < Main.maxBuffTypes) { // Max possible buff duration as of 1.4.2.2 is 35791393 seconds (415 days). - if (time < 0 || time > 35791393) - time = 35791393; + if (time < 0 || time > timeLimit) + time = timeLimit; args.Player.SetBuff(id, time * 60); args.Player.SendSuccessMessage(string.Format("You have buffed yourself with {0} ({1}) for {2} seconds!", TShock.Utils.GetBuffName(id), TShock.Utils.GetBuffDescription(id), (time)));