From f9fd80251c2e82fc46f822c1d65d57828bf0b690 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 29 Oct 2014 21:13:21 +0100 Subject: Core/Entites: ObjectGuid construction refactor (cherry picked from commit 15fbb6f46fb24fdc6f91786543b32f247e6525fc) --- src/server/game/Conditions/ConditionMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Conditions/ConditionMgr.cpp') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index e79f6605fb1..37ec4388560 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -260,7 +260,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const condMeets = instance->GetData(ConditionValue1) == ConditionValue2; break; case INSTANCE_INFO_GUID_DATA: - condMeets = instance->GetGuidData(ConditionValue1) == ObjectGuid(uint64(ConditionValue2)); + condMeets = instance->GetGuidData(ConditionValue1).GetRawValue() == uint64(ConditionValue2); break; case INSTANCE_INFO_BOSS_STATE: condMeets = instance->GetBossState(ConditionValue1) == EncounterState(ConditionValue2); -- cgit v1.2.3