Merge pull request #18 from gitFurious/dev

v1.4.1.0
gitFurious · Apr 5, 2016 · e408a96 · e408a96
2 parents 7efd709 + dead806
commit e408a96
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,10 @@ A Nuget package is available at [www.nuget.org/packages/HaloSharp](https://www.n
 
 ### Changelog ###
 
+###### v.1.4.1.0 (2016-04-05)
+
+1. Fixed a bug where I was using an int instead of an Enum (DeathDisposition)
+
 ###### v.1.4.0.0 (2016-04-05)
 
 1. Stats Endpoints.

diff --git a/Source/HaloSharp.Test/Properties/AssemblyInfo.cs b/Source/HaloSharp.Test/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
diff --git a/Source/HaloSharp/Model/Enumeration.cs b/Source/HaloSharp/Model/Enumeration.cs
@@ -58,6 +58,13 @@ public enum Difficulty
             Legendary = 3
         }
 
+        public enum Disposition
+        {
+            Friendly = 0,
+            Hostile = 1,
+            Neutral = 2
+        }
+
         public enum EventType
         {
             Death

diff --git a/Source/HaloSharp/Model/Stats/CarnageReport/MatchEvents.cs b/Source/HaloSharp/Model/Stats/CarnageReport/MatchEvents.cs
@@ -114,7 +114,7 @@ public class GameEvent : IEquatable<GameEvent>
         ///     </list>
         /// </summary>
         [JsonProperty(PropertyName = "DeathDisposition")]
-        public int DeathDisposition { get; set; }
+        public Enumeration.Disposition DeathDisposition { get; set; }
 
         /// <summary>
         ///     Describes if the death was committed by the killer from behind (Assassination or melee to back).
@@ -312,7 +312,7 @@ public override int GetHashCode()
             unchecked
             {
                 var hashCode = Assistants?.GetHashCode() ?? 0;
-                hashCode = (hashCode*397) ^ DeathDisposition;
+                hashCode = (hashCode*397) ^ (int) DeathDisposition;
                 hashCode = (hashCode*397) ^ IsAssassination.GetHashCode();
                 hashCode = (hashCode*397) ^ IsGroundPound.GetHashCode();
                 hashCode = (hashCode*397) ^ IsHeadshot.GetHashCode();

diff --git a/Source/HaloSharp/Properties/AssemblyInfo.cs b/Source/HaloSharp/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
 
 //HaloSharp.Test
 [assembly: InternalsVisibleTo("HaloSharp.Test")]