Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[7713] Fix AreaGroup.dbc structure, more correct check it Author: DiSlord

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-25 09:06:43 -05:00
parent 7901962074
commit c4e6f9708f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/DBCStructure.h
View File

@@ -512,7 +512,8 @@ struct AreaTableEntry
struct AreaGroupEntry
{
uint32 AreaGroupId; // 0
uint32 AreaId[7]; // 1-7
uint32 AreaId[6]; // 1-6
uint32 nextGroup; // 7 index of next group
};
struct AreaTriggerEntry

11
src/game/SpellMgr.cpp
View File

@@ -2845,15 +2845,18 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
if( spellInfo->AreaGroupId > 0)
{
bool found = false;
AreaGroupEntry const* groupEntry = sAreaGroupStore.LookupEntry(spellInfo->AreaGroupId);
if(groupEntry)
while (groupEntry)
{
for (uint8 i=0; i<7; i++)
for (uint32 i=0; i<6; i++)
if( groupEntry->AreaId[i] == zone_id || groupEntry->AreaId[i] == area_id )
found = true;
if (found || !groupEntry->nextGroup)
break;
// Try search in next group
groupEntry = sAreaGroupStore.LookupEntry(groupEntry->nextGroup);
}
if(!found)
return SPELL_FAILED_INCORRECT_AREA;
}