Core/Refactor: Part 2

Source/Game/Achievements/AchievementManager.cs

@@ -162,7 +162,7 @@ namespace Game.Achievements
                 {
                     if (criteriaTree.Criteria != null)
                     {
-                        CriteriaProgress criteriaProgress = this.GetCriteriaProgress(criteriaTree.Criteria);
+                        CriteriaProgress criteriaProgress = GetCriteriaProgress(criteriaTree.Criteria);
                         if (criteriaProgress != null)
                             progress += (long)criteriaProgress.Counter;
                     }
@@ -656,7 +656,7 @@ namespace Game.Achievements
 
         public override string GetOwnerInfo()
         {
-            return string.Format("{0} {1}", _owner.GetGUID().ToString(), _owner.GetName());
+            return $"{_owner.GetGUID().ToString()} {_owner.GetName()}";
         }
 
         Player _owner;
@@ -1017,7 +1017,7 @@ namespace Game.Achievements
 
         public override string GetOwnerInfo()
         {
-            return string.Format("Guild ID {0} {1}", _owner.GetId(), _owner.GetName());
+            return $"Guild ID {_owner.GetId()} {_owner.GetName()}";
         }
 
         Guild _owner;

Source/Game/Achievements/CriteriaHandler.cs

@@ -1554,7 +1554,8 @@ namespace Game.Achievements
             uint questObjectiveCriterias = 0;
             foreach (CriteriaRecord criteriaEntry in CliDB.CriteriaStorage.Values)
             {
-                Contract.Assert(criteriaEntry.Type < CriteriaTypes.TotalTypes, string.Format("CRITERIA_TYPE_TOTAL must be greater than or equal to {0} but is currently equal to {1}", criteriaEntry.Type + 1, CriteriaTypes.TotalTypes));
+                Contract.Assert(criteriaEntry.Type < CriteriaTypes.TotalTypes,
+                    $"CRITERIA_TYPE_TOTAL must be greater than or equal to {criteriaEntry.Type + 1} but is currently equal to {CriteriaTypes.TotalTypes}");
 
                 var treeList = _criteriaTreeByCriteria.LookupByKey(criteriaEntry.Id);
                 if (treeList.Empty())
@@ -1819,7 +1820,7 @@ namespace Game.Achievements
 
         public CriteriaData(CriteriaDataType _dataType, uint _value1, uint _value2, uint _scriptId)
         {
-            this.DataType = _dataType;
+            DataType = _dataType;
 
             Raw.Value1 = _value1;
             Raw.Value2 = _value2;