From 02cbb905fa43eda14a772bd462e4e0950c0ced68 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Fri, 3 Jun 2011 12:15:33 +0400
Subject: [PATCH] [11591] Apply spellLevel as reqlevel for non-prof. training
 spell only.

---
 src/game/ObjectMgr.cpp   | 19 +++++++++++--------
 src/shared/revision_nr.h |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 0ca075eff..b121a6812 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -8120,14 +8120,6 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
 
         // already checked as valid spell so exist.
         SpellEntry const *learnSpellinfo = sSpellStore.LookupEntry(trainerSpell.learnedSpell);
-        if (trainerSpell.reqLevel)
-        {
-            if (trainerSpell.reqLevel == learnSpellinfo->spellLevel)
-                ERROR_DB_STRICT_LOG("Table `%s` (Entry: %u) has redundant reqlevel %u (=spell level) for spell %u", tableName, entry, trainerSpell.reqLevel, spell);
-        }
-        else
-            trainerSpell.reqLevel = learnSpellinfo->spellLevel;
-
         if (SpellMgr::IsProfessionSpell(trainerSpell.learnedSpell))
         {
             data.trainerType = 2;
@@ -8143,6 +8135,17 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
             else
                 trainerSpell.reqLevel = minLevel;
         }
+        // for non-prof. spell use spellLevel if not provided any
+        else
+        {
+            if (trainerSpell.reqLevel)
+            {
+                if (trainerSpell.reqLevel == learnSpellinfo->spellLevel)
+                    ERROR_DB_STRICT_LOG("Table `%s` (Entry: %u) has redundant reqlevel %u (=spell level) for spell %u", tableName, entry, trainerSpell.reqLevel, spell);
+            }
+            else
+                trainerSpell.reqLevel = learnSpellinfo->spellLevel;
+        }
 
         ++count;
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 90e712cb9..6e918217f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11590"
+ #define REVISION_NR "11591"
 #endif // __REVISION_NR_H__