mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-25 06:36:24 +00:00
Merge branch 'master' into Playerbot
This commit is contained in:
@@ -352,7 +352,7 @@ public:
|
||||
float x = locationValues[0];
|
||||
float y = locationValues[1];
|
||||
|
||||
if (!sMapStore.LookupEntry(mapId))
|
||||
if (!sMapStore.LookupEntry(mapId) || !MapMgr::IsValidMapCoord(mapId, x, y))
|
||||
{
|
||||
handler->SendErrorMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
|
||||
return false;
|
||||
|
||||
@@ -390,16 +390,8 @@ public:
|
||||
{
|
||||
uint32 classmask = player->getClassMask();
|
||||
|
||||
for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
|
||||
for (SkillLineAbilityEntry const* skillLine : GetSkillLineAbilitiesBySkillLine(skillId))
|
||||
{
|
||||
SkillLineAbilityEntry const* skillLine = sSkillLineAbilityStore.LookupEntry(j);
|
||||
if (!skillLine)
|
||||
continue;
|
||||
|
||||
// wrong skill
|
||||
if (skillLine->SkillLine != skillId)
|
||||
continue;
|
||||
|
||||
// not high rank
|
||||
if (skillLine->SupercededBySpell)
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user