Core/Refactor: Part 2

Source/Game/Entities/Creature/Creature.cs

@@ -3052,7 +3052,7 @@ namespace Game.Entities
                 // The last taunt aura caster is alive an we are happy to attack him
                 if (caster != null && caster.IsAlive())
                     return GetVictim();
-                else if (tauntAuras.Count() > 1)
+                else if (tauntAuras.Count > 1)
                 {
                     // We do not have last taunt aura caster but we have more taunt auras,
                     // so find first available target

Source/Game/Entities/Creature/Gossip.cs

@@ -793,7 +793,7 @@ namespace Game.Misc
 
         public int GetMenuItemCount()
         {
-            return _questMenuItems.Count();
+            return _questMenuItems.Count;
         }
 
         public bool IsEmpty()

Source/Game/Entities/Creature/Trainer.cs

@@ -108,7 +108,7 @@ namespace Game.Entities
 
         TrainerSpellState GetSpellState(Player player, TrainerSpell trainerSpell)
         {
-            if (player.HasSpell(trainerSpell.SpellId))
+            if (player.HasSpell(trainerSpell.IsCastable() ? trainerSpell.LearnedSpellId : trainerSpell.SpellId))
                 return TrainerSpellState.Known;
 
             // check race/class requirement