Core/Condition: Add In Water Condition

Updates #7019

(cherry picked from commit 5f8db047614a492dd178325b429839609d9f7fc5)

Conflicts:
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h

Closes #15285

CONDITION_TERRAIN_SWAP (40) has been changed to 41 to keep compatibility with the 3.3.5 branch

1 files changed, 12 insertions, 0 deletions

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 7cae9ee2221..8a37012f5f4 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -101,6 +101,7 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND
     { "Health Value",         true, true,  false },
     { "Health Pct",           true, true,  false },
     { "Realm Achievement",    true, false, false },
+    { "In Water",            false, false, false },
     { "Terrain Swap",         true, false, false }
 };
 
@@ -425,6 +426,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
                 condMeets = true;
             break;
         }
+        case CONDITION_IN_WATER:
+        {
+            if (Unit* unit = object->ToUnit())
+                condMeets = unit->IsInWater();
+            break;
+        }
         case CONDITION_TERRAIN_SWAP:
         {
             condMeets = object->IsInTerrainSwap(ConditionValue1);
@@ -602,6 +609,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
         case CONDITION_REALM_ACHIEVEMENT:
             mask |= GRID_MAP_TYPE_MASK_ALL;
             break;
+        case CONDITION_IN_WATER:
+            mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER;
+            break;
         case CONDITION_TERRAIN_SWAP:
             mask |= GRID_MAP_TYPE_MASK_ALL;
             break;
@@ -2120,6 +2130,8 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
             }
             break;
         }
+        case CONDITION_IN_WATER:
+            break;
         default:
             break;
     }