From 6e20c8d719f00edc10231eabbcefa6a4386258d5 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sun, 17 Jul 2016 18:20:55 +0200 Subject: [PATCH] minor cleanup --- NadekoBot/Modules/Help/HelpModule.cs | 1 - NadekoBot/Modules/Pokemon/PokemonModule.cs | 6 +++--- NadekoBot/Modules/Searches/Commands/EvalCommand.cs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/NadekoBot/Modules/Help/HelpModule.cs b/NadekoBot/Modules/Help/HelpModule.cs index 511779c2..941ffa9e 100644 --- a/NadekoBot/Modules/Help/HelpModule.cs +++ b/NadekoBot/Modules/Help/HelpModule.cs @@ -53,7 +53,6 @@ namespace NadekoBot.Modules.Help await e.Channel.SendMessage("That module does not exist.").ConfigureAwait(false); return; } - var i = 0; if (module != "customreactions" && module != "conversations") { await e.Channel.SendMessage("`List Of Commands:`\n" + SearchHelper.ShowInPrettyCode(cmdsArray, diff --git a/NadekoBot/Modules/Pokemon/PokemonModule.cs b/NadekoBot/Modules/Pokemon/PokemonModule.cs index bef55e56..ae3ae0d9 100644 --- a/NadekoBot/Modules/Pokemon/PokemonModule.cs +++ b/NadekoBot/Modules/Pokemon/PokemonModule.cs @@ -210,7 +210,7 @@ namespace NadekoBot.Modules.Pokemon }); cgb.CreateCommand(Prefix + "heal") - .Description($"Heals someone. Revives those who fainted. Costs a {NadekoBot.Config.CurrencyName} | {Prefix}revive @someone") + .Description($"Heals someone. Revives those who fainted. Costs a {NadekoBot.Config.CurrencyName} | {Prefix}heal @someone") .Parameter("target", ParameterType.Unparsed) .Do(async e => { @@ -242,7 +242,7 @@ namespace NadekoBot.Modules.Pokemon return; } var target = (usr.Id == e.User.Id) ? "yourself" : usr.Name; - FlowersHandler.RemoveFlowers(e.User, $"Poke-Heal {target}", amount); + await FlowersHandler.RemoveFlowers(e.User, $"Poke-Heal {target}", amount).ConfigureAwait(false); //healing targetStats.Hp = targetStats.MaxHp; if (HP < 0) @@ -309,7 +309,7 @@ namespace NadekoBot.Modules.Pokemon await e.Channel.SendMessage($"{e.User.Mention} you don't have enough {NadekoBot.Config.CurrencyName}s! \nYou still need {amount - pts} {NadekoBot.Config.CurrencySign} to be able to do this!").ConfigureAwait(false); return; } - FlowersHandler.RemoveFlowers(e.User, $"set usertype to {targetTypeStr}", amount); + await FlowersHandler.RemoveFlowers(e.User, $"set usertype to {targetTypeStr}", amount).ConfigureAwait(false); //Actually changing the type here var preTypes = DbHandler.Instance.GetAllRows(); Dictionary Dict = preTypes.ToDictionary(x => x.UserId, y => y.Id.Value); diff --git a/NadekoBot/Modules/Searches/Commands/EvalCommand.cs b/NadekoBot/Modules/Searches/Commands/EvalCommand.cs index 0e815f71..ed469517 100644 --- a/NadekoBot/Modules/Searches/Commands/EvalCommand.cs +++ b/NadekoBot/Modules/Searches/Commands/EvalCommand.cs @@ -49,11 +49,11 @@ namespace NadekoBot.Modules.Searches.Commands string result = parser.Parse(expression).ToString(); return result; } - catch (OverflowException e) + catch (OverflowException) { return $"Overflow error on {expression}"; } - catch (FormatException e) + catch (FormatException) { return $"\"{expression}\" was not formatted correctly"; }