From 47fb4f8c27885919e413eca8f7104b1b115ae07d Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Tue, 2 Oct 2018 14:53:59 +0000 Subject: [PATCH] Zway-Bot [v1.7.2] Add Logging to some Modules, fixing a bug in overtaker (now it not removes every time all events, so only the latest event are watched) [Utils] Fixing a bug if more than one argument with params --- CmdArgs.cs | 9 ++++----- Properties/AssemblyInfo.cs | 6 +++--- bin/Release/Utils.dll | Bin 29184 -> 29696 bytes 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CmdArgs.cs b/CmdArgs.cs index 78cd539..0468147 100644 --- a/CmdArgs.cs +++ b/CmdArgs.cs @@ -38,7 +38,7 @@ namespace BlubbFish.Utils public ArgTouple(String type) { this.Type = type; - this.Data = ""; + this.Data = null; } public String Type { get; private set; } public String Data { get; private set; } @@ -100,7 +100,8 @@ namespace BlubbFish.Utils if (this.args.Length > i + 1) { arg.SetData(this.args[++i]); } else { - throw new ArgumentException(); + Console.WriteLine(this.GetUsageList("")); + throw new ArgumentException("Argument: "+this.args[i]+" missing second argument."); } } this.argList.Add(arg); @@ -142,11 +143,9 @@ namespace BlubbFish.Utils foreach (ArgTouple t in this.argList) { if (t.Type == name && t.Data != null) { return t.Data; - } else { - throw new ArgumentNullException(); } } - return null; + throw new ArgumentNullException(); } public Boolean HasAllRequiredArguments() diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 5681c06..cd49385 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Utils")] -[assembly: AssemblyCopyright("Copyright © 2014 - 15.05.2018")] +[assembly: AssemblyCopyright("Copyright © 2014 - 02.10.2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.2")] -[assembly: AssemblyFileVersion("1.1.2")] +[assembly: AssemblyVersion("1.1.3")] +[assembly: AssemblyFileVersion("1.1.3")] diff --git a/bin/Release/Utils.dll b/bin/Release/Utils.dll index e55e051c2ccf571d44353ea96b464d3d6cdd620a..d588c76cae731a9dd0443153809273a70135116a 100644 GIT binary patch delta 7916 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 m{~fg4P=B_WuL0Q1Pz- delta 7553 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