Water identification fix

src/game/Object/Player.cpp

@@ -6023,6 +6023,7 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
 {
     GridMapLiquidData liquid_status;
     GridMapLiquidStatus res = m->GetTerrain()->getLiquidStatus(x, y, z, MAP_ALL_LIQUIDS, &liquid_status);
+    SetInWater(res & (LIQUID_MAP_IN_WATER | LIQUID_MAP_UNDER_WATER));
     if (!res)
     {
         m_MirrorTimerFlags &= ~(UNDERWATER_INWATER | UNDERWATER_INLAVA | UNDERWATER_INSLIME | UNDERWATER_INDARKWATER);

src/game/WorldHandlers/World.cpp

@@ -75,6 +75,7 @@
 #include "BattleGround/BattleGroundMgr.h"
 #include "OutdoorPvP/OutdoorPvP.h"
 #include "VMapFactory.h"
+#include "VMapManager2.h"
 #include "MoveMap.h"
 #include "GameEventMgr.h"
 #include "PoolManager.h"
@@ -444,6 +445,18 @@ void World::SetInitialWorldSettings()
     DetectDBCLang();
     sObjectMgr.SetDBCLocaleIndex(GetDefaultDbcLocale());    // Get once for all the locale index of DBC language (console/broadcasts)
 
+    ///- Populate vmap liquid type map from DBC data
+    if (VMAP::VMapManager2* vmmgr2 = dynamic_cast<VMAP::VMapManager2*>(VMAP::VMapFactory::createOrGetVMapManager()))
+    {
+        for (uint32 i = 0; i < sLiquidTypeStore.GetNumRows(); ++i)
+        {
+            if (LiquidTypeEntry const* entry = sLiquidTypeStore.LookupEntry(i))
+            {
+                vmmgr2->SetLiquidTypeMap(entry->ID, 1 << entry->Type);
+            }
+        }
+    }
+
     StartupUI::Step("Loading Script Names...");
     sScriptMgr.LoadScriptNames();
 

src/game/vmap/VMapManager2.cpp

@@ -360,10 +360,16 @@ namespace VMAP
                 {
                     floor = info.ground_Z;
                     type = info.hitModel->GetLiquidType();
-                    if (ReqLiquidType && !(type & ReqLiquidType))
+
+                    if (ReqLiquidType)
                     {
-                        return false;
+                        UNORDERED_MAP<uint32, uint8>::const_iterator it = iLiquidTypeMap.find(type);
+                        if (it != iLiquidTypeMap.end() && !(it->second & ReqLiquidType))
+                        {
+                            return false;
+                        }
                     }
+
                     if (info.hitInstance->GetLiquidLevel(pos, info, level))
                     {
                         return true;

src/game/vmap/VMapManager2.h

@@ -129,6 +129,8 @@ namespace VMAP
             ModelFileMap iLoadedModelFiles; /**< Map of loaded model files. */
             InstanceTreeMap iInstanceMapTrees; /**< Map of instance trees. */
 
+            UNORDERED_MAP<uint32, uint8> iLiquidTypeMap; /**< DBC entry ID to liquid type bitmask. */
+
             /**
              * @brief Internal method to load a map tile.
              *
@@ -278,6 +280,8 @@ namespace VMAP
              */
             bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float& level, float& floor, uint32& type) const override;
 
+            void SetLiquidTypeMap(uint32 entryId, uint8 bitmask) { iLiquidTypeMap[entryId] = bitmask; }
+
             /**
              * @brief Acquires a model instance.
              *