From 10fcfde78b7ebf9008d148d5db67e183e3402d55 Mon Sep 17 00:00:00 2001 From: Jozef Dúc Date: Thu, 11 Apr 2019 21:06:53 +0200 Subject: Core/Creatures: Filter out trainer spells that belong to a skill that can never be learned by a player with given class and race combination (#23176) Closes #23172 (cherry picked from commit f221fcdd4b91e27c69a38dc665621797af0640c9) --- src/server/game/Entities/Player/Player.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9751b596fe2..2d8d3cd0043 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25178,6 +25178,10 @@ bool Player::IsSpellFitByClassAndRace(uint32 spell_id) const if (_spell_idx->second->ClassMask && (_spell_idx->second->ClassMask & classmask) == 0) continue; + // skip wrong class and race skill saved in SkillRaceClassInfo.dbc + if (!sDB2Manager.GetSkillRaceClassInfo(_spell_idx->second->SkillLine, getRace(), getClass())) + continue; + return true; } -- cgit v1.2.3