mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12025] Fix a stupid mistake from 12017

Browse source
This commit is contained in:
Schmoozerd 2012-07-03 17:13:46 +02:00
parent 00f4b2e6f2
commit b607d6a3fd
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/game/SpellMgr.cpp
View file

@ -4514,47 +4514,47 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const
{
if(gender!=GENDER_NONE)
if (gender != GENDER_NONE)
{
// not in expected gender
if(!player || gender != player->getGender())
if (!player || gender != player->getGender())
return false;
}
if (raceMask)
{
// not in expected race
if (!(raceMask & player->getRaceMask()))
if (!player || !(raceMask & player->getRaceMask()))
return false;
}
if(areaId)
if (areaId)
{
// not in expected zone
if(newZone!=areaId && newArea!=areaId)
if (newZone != areaId && newArea != areaId)
return false;
}
if(questStart)
if (questStart)
{
// not in expected required quest state
if(!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
if (!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
return false;
}
if(questEnd)
if (questEnd)
{
// not in expected forbidden quest state
if(!player || player->GetQuestRewardStatus(questEnd))
if (!player || player->GetQuestRewardStatus(questEnd))
return false;
}
if(auraSpell)
if (auraSpell)
{
// not have expected aura
if(!player)
if (!player)
return false;
if(auraSpell > 0)
if (auraSpell > 0)
// have expected aura
return player->HasAura(auraSpell, EFFECT_INDEX_0);
else