diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-14 22:40:53 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-14 22:40:53 +0100 |
| commit | 11846f5990f5af421ff2fc087925245f61b4ac84 (patch) | |
| tree | ee2f55e87ffc1e2ca90508d0932e9c717e3edacb /src | |
| parent | 556694b40b5a605990e4a4c944e67ff72f4362ce (diff) | |
| parent | 329b343ccfde61f0078c1cf0afd1ecea8f550c9b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 12bc3f741f5..6ffd0c016ad 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -3179,7 +3179,7 @@ void ObjectMgr::LoadPlayerInfo() { if (PlayerInfo* info = _playerInfo[raceIndex][classIndex]) info->spell.push_back(fields[2].GetUInt32()); - else + else if (raceMask != 0 && classMask != 0) sLog->outError(LOG_FILTER_SQL, "Racemask/classmask (%u/%u) combination was found containing an invalid race/class combination (%u/%u) in `playercreateinfo_spell` (Spell %u), ignoring.", raceMask, classMask, raceIndex, classIndex, fields[2].GetUInt32()); } } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 8b771f507c2..3d22bac4376 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -54,7 +54,7 @@ enum Yells SAY_SYLVANAS_OUTRO_4 = 4 }; -enum Spelsl +enum Spells { SPELL_OVERLORD_BRAND = 69172, SPELL_OVERLORD_BRAND_HEAL = 69190, |