diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2017-07-31 21:23:26 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2017-07-31 21:23:26 +0200 |
| commit | 232db9777a3425891f55b5b94a02fa619adafcb5 (patch) | |
| tree | 558af5bb20ba40d7dcdbbf06a5b4e9eddf0b2664 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | d24ce1739a799042d5a164794c09674227c8572c (diff) | |
| parent | 59db2eeea0a35028779fd76372ae06cc98c8086f (diff) | |
Merge remote-tracking branch 'base/dynamic_spawning' into 3.3.5 (PR #19056).
IT'S HAPPENING.
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | 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 146d2cb3bde..ba456998042 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -2011,7 +2011,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const } if (cond->ConditionValue3) { - if (GameObjectData const* goData = sObjectMgr->GetGOData(cond->ConditionValue3)) + if (GameObjectData const* goData = sObjectMgr->GetGameObjectData(cond->ConditionValue3)) { if (cond->ConditionValue2 && goData->id != cond->ConditionValue2) { |