diff --git a/src/LS_loader.cpp b/src/LS_loader.cpp index 82714e0..f4ae5c1 100644 --- a/src/LS_loader.cpp +++ b/src/LS_loader.cpp @@ -5,6 +5,7 @@ void AddSC_LearnAllSpells(); -void Addmod_learn_spellsScripts() { +void Addmod_learn_spellsScripts() +{ AddSC_LearnAllSpells(); } diff --git a/src/mod_learnspells.cpp b/src/mod_learnspells.cpp index 74e3427..cd30aad 100644 --- a/src/mod_learnspells.cpp +++ b/src/mod_learnspells.cpp @@ -9,21 +9,23 @@ class LearnSpellsOnLevelUp : public PlayerScript { public: - LearnSpellsOnLevelUp() : PlayerScript("LearnSpellsOnLevelUp") { } + LearnSpellsOnLevelUp() : PlayerScript("LearnSpellsOnLevelUp", { + PLAYERHOOK_ON_FIRST_LOGIN, + PLAYERHOOK_ON_LEVEL_CHANGED + }) { } void OnPlayerFirstLogin(Player* player) override { if (sConfigMgr->GetOption("LearnSpells.OnFirstLogin", 0)) - { LearnSpellsForNewLevel(player, 1); + + if (player->getClass() == CLASS_SHAMAN) + { + player->AddItem(5175, 1); // Earth Totem + player->AddItem(5176, 1); // Fire Totem + player->AddItem(5177, 1); // Water Totem + player->AddItem(5178, 1); // Air Totem } - if (player->getClass() == CLASS_SHAMAN) - { - player->AddItem(5175, 1); // Earth Totem - player->AddItem(5176, 1); // Fire Totem - player->AddItem(5177, 1); // Water Totem - player->AddItem(5178, 1); // Air Totem - } } void OnPlayerLevelChanged(Player* player, uint8 oldLevel) override @@ -480,9 +482,7 @@ class LearnSpellsOnLevelUp : public PlayerScript for (auto const& spell : additionalSpellsToTeach) { if (!(player->HasSpell(spell.spellId)) && (spell.faction == TeamId::TEAM_NEUTRAL || spell.faction == player->GetTeamId())) - { player->learnSpell(spell.spellId); - } } } }