Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Achievements: Minimize branch differences

Browse Source
This commit is contained in:
Shauren
2016-09-12 20:41:21 +02:00
parent 42f2b3525c
commit f56d757735
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Achievements/CriteriaHandler.cpp
View File

@@ -1253,10 +1253,13 @@ bool CriteriaHandler::RequirementsSatisfied(Criteria const* criteria, uint64 mis
return false;
break;
case CRITERIA_TYPE_WIN_BG:
case CRITERIA_TYPE_COMPLETE_BATTLEGROUND:
case CRITERIA_TYPE_DEATH_AT_MAP:
if (!miscValue1 || criteria->Entry->Asset.MapID != referencePlayer->GetMapId())
return false;
break;
case CRITERIA_TYPE_KILL_CREATURE:
case CRITERIA_TYPE_KILLED_BY_CREATURE:
if (!miscValue1 || criteria->Entry->Asset.CreatureID != miscValue1)
return false;
break;
@@ -1270,11 +1273,6 @@ bool CriteriaHandler::RequirementsSatisfied(Criteria const* criteria, uint64 mis
if (miscValue1 && miscValue1 != criteria->Entry->Asset.ZoneID)
return false;
break;
case CRITERIA_TYPE_COMPLETE_BATTLEGROUND:
case CRITERIA_TYPE_DEATH_AT_MAP:
if (!miscValue1 || referencePlayer->GetMapId() != criteria->Entry->Asset.MapID)
return false;
break;
case CRITERIA_TYPE_DEATH:
{
if (!miscValue1)
@@ -1295,10 +1293,6 @@ bool CriteriaHandler::RequirementsSatisfied(Criteria const* criteria, uint64 mis
return false;
break;
}
case CRITERIA_TYPE_KILLED_BY_CREATURE:
if (!miscValue1 || miscValue1 != criteria->Entry->Asset.CreatureID)
return false;
break;
case CRITERIA_TYPE_KILLED_BY_PLAYER:
if (!miscValue1 || !unit || unit->GetTypeId() != TYPEID_PLAYER)
return false;