From ba5c1753a9c947c2bef31930287fb19deaddf346 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Wed, 22 Jul 2015 01:46:01 +0200 Subject: [PATCH] Fix merge --- src/server/game/Conditions/ConditionMgr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 0df297b4a90..f791edec316 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -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: