diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-22 02:02:57 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-22 02:02:57 +0100 |
| commit | 7090197c6ade85e1b223d3cb46923b89133f89a5 (patch) | |
| tree | edfa18cfe6e277ee421009b6fd5bb335e1bc4aac /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | a692526b88c000d73c8ae6306d08abf8c194f4bd (diff) | |
| parent | 7213843c229266f533d1932d02706981f8b041bb (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Spells/Auras/SpellAuras.cpp
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/ConditionMgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index f6a2c56b794..917c4cd7f90 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -223,6 +223,9 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) case RELATION_PASSENGER_OF: condMeets = unit->IsOnVehicle(toUnit); break; + case RELATION_CREATED_BY: + condMeets = unit->GetCreatorGUID() == toUnit->GetGUID(); + break; } } } |