Core/Refactor: Part 1

Source/Game/Entities/Player/Player.Map.cs

@@ -30,11 +30,6 @@ namespace Game.Entities
 {
     public partial class Player
     {
-        public override void SetMap(Map map)
-        {
-            base.SetMap(map);
-        }
-
         public Difficulty GetDifficultyID(MapRecord mapEntry)
         {
             if (!mapEntry.IsRaid())

Source/Game/Entities/Player/Player.Quest.cs

@@ -1683,9 +1683,12 @@ namespace Game.Entities
                     }
 
                     bool destroyItem = true;
-                    foreach (QuestObjective obj in quest.Objectives)
-                        if (obj.Type == QuestObjectiveType.Item && srcItemId == obj.ObjectID)
-                            destroyItem = false;
+                    if (item.GetStartQuest() == questId)
+                    {
+                        foreach (QuestObjective obj in quest.Objectives)
+                            if (obj.Type == QuestObjectiveType.Item && srcItemId == obj.ObjectID)
+                                destroyItem = false;
+                    }
 
                     if (destroyItem)
                         DestroyItemCount(srcItemId, count, true, true);