Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Carbenium
2015-07-22 01:46:01 +02:00
parent 82ea8da720
commit ba5c1753a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Conditions/ConditionMgr.h
View File

@@ -74,8 +74,8 @@ enum ConditionTypes
CONDITION_HP_PCT = 38, // hpPct ComparisonType 0 true if unit's hp matches given pct
CONDITION_TERRAIN_SWAP = 39, // terrainSwap 0 0 true if object is in terrainswap
CONDITION_REALM_ACHIEVEMENT = 40, // achievement_id 0 0 true if realm achievement is complete
CONDITION_IN_WATER = 40, // 0 0 0 true if unit in water
CONDITION_MAX = 41 // MAX
CONDITION_IN_WATER = 41, // 0 0 0 true if unit in water
CONDITION_MAX = 42 // MAX
};
/*! Documentation on implementing a new ConditionSourceType: