diff options
3 files changed, 51 insertions, 2 deletions
diff --git a/sql/updates/world/2013_03_13_03_world_playercreateinfo_spell.sql b/sql/updates/world/2013_03_13_03_world_playercreateinfo_spell.sql new file mode 100644 index 00000000000..0212fef5cd1 --- /dev/null +++ b/sql/updates/world/2013_03_13_03_world_playercreateinfo_spell.sql @@ -0,0 +1,49 @@ +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=0 WHERE `Spell`=56816; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=0 WHERE `Spell`=75461; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=0 WHERE `Spell`=75445; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=669; +UPDATE `playercreateinfo_spell` SET `racemask`=223, `classmask`=8 WHERE `Spell`=2567; +UPDATE `playercreateinfo_spell` SET `racemask`=223, `classmask`=8 WHERE `Spell`=2764; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=8 WHERE `Spell`=1180; +UPDATE `playercreateinfo_spell` SET `racemask`=1029, `classmask`=1 WHERE `Spell`=199; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=33 WHERE `Spell`=668; +UPDATE `playercreateinfo_spell` SET `racemask`=529, `classmask`=0 WHERE `Spell`=5009; +UPDATE `playercreateinfo_spell` SET `racemask`=529, `classmask`=0 WHERE `Spell`=5019; +UPDATE `playercreateinfo_spell` SET `racemask`=1029, `classmask`=32 WHERE `Spell`=202; +UPDATE `playercreateinfo_spell` SET `racemask`=1029, `classmask`=32 WHERE `Spell`=8737; +UPDATE `playercreateinfo_spell` SET `racemask`=1198, `classmask`=32 WHERE `Spell`=196; +UPDATE `playercreateinfo_spell` SET `racemask`=1198, `classmask`=32 WHERE `Spell`=197; +UPDATE `playercreateinfo_spell` SET `racemask`=1028, `classmask`=32 WHERE `Spell`=201; +UPDATE `playercreateinfo_spell` SET `racemask`=735, `classmask`=32 WHERE `Spell`=674; +UPDATE `playercreateinfo_spell` SET `racemask`=1024, `classmask`=0 WHERE `Spell`=107; +UPDATE `playercreateinfo_spell` SET `racemask`=1024, `classmask`=0 WHERE `Spell`=9116; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=0 WHERE `Spell`=198; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=9077; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=0 WHERE `Spell`=227; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=81; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=203; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=204; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=522; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=1843; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=2382; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=2479; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=3050; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=3365; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=6233; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=6246; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=6247; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=6477; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=6478; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=6603; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=7266; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=7267; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=7355; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=8386; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=9078; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=9125; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=21651; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=21652; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=22027; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=22810; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=45927; +UPDATE `playercreateinfo_spell` SET `racemask`=0, `classmask`=32 WHERE `Spell`=61437; 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, |