Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-04-07 21:49:34 +08:00
45 changed files with 1497 additions and 755 deletions

View File

@@ -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;

View File

@@ -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;