diff --git a/NadekoBot/Classes/ServerSpecificConfig.cs b/NadekoBot/Classes/ServerSpecificConfig.cs index f99d36dc..4296b648 100644 --- a/NadekoBot/Classes/ServerSpecificConfig.cs +++ b/NadekoBot/Classes/ServerSpecificConfig.cs @@ -27,7 +27,13 @@ namespace NadekoBot.Classes { configs = JsonConvert .DeserializeObject>( - File.ReadAllText(filePath)); + File.ReadAllText(filePath), new JsonSerializerSettings() { + Error = (s,e) => { + if (e.ErrorContext.Member.ToString() == "GenerateCurrencyChannels") { + e.ErrorContext.Handled = true; + } + } + }); } catch (Exception ex) { @@ -239,7 +245,7 @@ namespace NadekoBot.Classes public override int GetHashCode() { - return (int)((int)ServerId + Username.Length + (int)Type); + return (int)ServerId + Username.Length + (int)Type; } } } diff --git a/NadekoBot/Modules/Searches/SearchesModule.cs b/NadekoBot/Modules/Searches/SearchesModule.cs index 8761ce69..466ff12c 100644 --- a/NadekoBot/Modules/Searches/SearchesModule.cs +++ b/NadekoBot/Modules/Searches/SearchesModule.cs @@ -364,15 +364,15 @@ $@"🌍 **Weather for** 【{obj["target"]}】 }); cgb.CreateCommand(Prefix + "magicitem") - .Alias(Prefix + "mi") - .Description("Shows a random magicitem from ") - .Do(async e => - { - var magicItems = JsonConvert.DeserializeObject>(File.ReadAllText("data/magicitems.json")); - var item = magicItems[rng.Next(0, magicItems.Count)].ToString(); + .Alias(Prefix + "mi") + .Description("Shows a random magicitem from ") + .Do(async e => + { + var magicItems = JsonConvert.DeserializeObject>(File.ReadAllText("data/magicitems.json")); + var item = magicItems[rng.Next(0, magicItems.Count)].ToString(); - await e.Channel.SendMessage(item).ConfigureAwait(false); - }); + await e.Channel.SendMessage(item).ConfigureAwait(false); + }); cgb.CreateCommand(Prefix + "revav") .Description("Returns a google reverse image search for someone's avatar.")