diff options
| author | joschiwald <joschiwald@online.de> | 2012-05-28 04:27:51 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald@online.de> | 2012-05-28 04:27:51 +0200 |
| commit | cd7ab6f3a5e86e51d19621ce5ab5560cd7eb62bc (patch) | |
| tree | 3e13fd8e4472a3dece8e6691df794f87bfe3e59d /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | ca07f30d0359bf5a6eecba8b9cc68702eca4071b (diff) | |
| parent | 9c417ff931a98a2ba35b30e76f8967c7f841e868 (diff) | |
Merge branch 'master' of github.com:joschiwald/TrinityCore into spellscripts
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/Spells/spell_paladin.cpp
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/ConditionMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 96f454fd3e2..4176d9f605b 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -190,7 +190,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) } case CONDITION_OBJECT_ENTRY: { - if (object->GetTypeId() == ConditionValue1) + if (uint32(object->GetTypeId()) == ConditionValue1) condMeets = (!ConditionValue2) || (object->GetEntry() == ConditionValue2); break; } |