aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/ConditionMgr.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-03-12 18:20:26 +0100
committerShauren <shauren.trinity@gmail.com>2018-03-12 23:11:49 +0100
commit007b5a68c50bbee7d05acec888d3273c2a5a8577 (patch)
tree4818b60a73730b98ae4785d0630edbd6cd27d5bf /src/server/game/Conditions/ConditionMgr.cpp
parent50a912af72ca84095eab5effa7d70e8a50ff8a04 (diff)
Core/DataStores: Fixed db2 structures after 7.3.5
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index b75f2709eb6..a2a97faa783 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -2502,10 +2502,10 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio
{
if (ChrSpecializationEntry const* spec = sChrSpecializationStore.LookupEntry(player->GetUInt32Value(PLAYER_FIELD_CURRENT_SPEC_ID)))
{
- if (condition->ChrSpecializationIndex >= 0 && spec->OrderIndex != uint32(condition->ChrSpecializationIndex))
+ if (condition->ChrSpecializationIndex >= 0 && spec->OrderIndex != condition->ChrSpecializationIndex)
return false;
- if (condition->ChrSpecializationRole >= 0 && spec->Role != uint32(condition->ChrSpecializationRole))
+ if (condition->ChrSpecializationRole >= 0 && spec->Role != condition->ChrSpecializationRole)
return false;
}
}
@@ -2596,10 +2596,10 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio
if (condition->MovementFlags[1] && !(player->GetExtraUnitMovementFlags() & condition->MovementFlags[1]))
return false;
- if (condition->MainHandItemSubclassMask)
+ if (condition->WeaponSubclassMask)
{
Item* mainHand = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
- if (!mainHand || !((1 << mainHand->GetTemplate()->GetSubClass()) & condition->MainHandItemSubclassMask))
+ if (!mainHand || !((1 << mainHand->GetTemplate()->GetSubClass()) & condition->WeaponSubclassMask))
return false;
}
@@ -2740,8 +2740,8 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio
{
if (condition->AuraSpellID[i])
{
- if (condition->AuraCount[i])
- results[i] = player->GetAuraCount(condition->AuraSpellID[i]) >= condition->AuraCount[i];
+ if (condition->AuraStacks[i])
+ results[i] = player->GetAuraCount(condition->AuraSpellID[i]) >= condition->AuraStacks[i];
else
results[i] = player->HasAura(condition->AuraSpellID[i]);
}