Core/Refactor: Part 1

2018-05-07 18:56:09 -04:00
parent b2c1554065
commit 216db1c23a
83 changed files with 298 additions and 296 deletions
@@ -180,12 +180,6 @@ namespace Game.Entities

        public static bool operator ==(ObjectGuid first, ObjectGuid other)
        {
-            if (ReferenceEquals(first, other))
-                return true;
-
-            if ((object)first == null || (object)other == null)
-                return false;
-
            return first.Equals(other);
        }

@@ -2444,10 +2444,9 @@ namespace Game.Entities

        public bool IsInMap(WorldObject obj)
        {
-            var m = GetMap().GetId();
-            var b = obj.GetMap().GetId();
            if (obj != null)
-                return IsInWorld && obj.IsInWorld && m == b;
+                return IsInWorld && obj.IsInWorld && GetMap().GetId() == obj.GetMap().GetId();
+
            return false;
        }