From e277588689499f35c91014dbda1b76cb8ab69e2c Mon Sep 17 00:00:00 2001
From: Kandera <KanderaDev@gmail.com>
Date: Fri, 17 Feb 2012 14:25:08 -0500
Subject: fix blink making you fall under ground when blinking into water
 (needs correct liquid level calculations)

---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 39f695c0868..3562835d957 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -1555,7 +1555,7 @@ float Map::GetWaterOrGroundLevel(float x, float y, float z, float* ground /*= NU
         LiquidData liquid_status;
 
         ZLiquidStatus res = getLiquidStatus(x, y, ground_z, MAP_ALL_LIQUIDS, &liquid_status);
-        return res ? ( swim ? liquid_status.level - 2.0f : liquid_status.level) : ground_z;
+        return res ? liquid_status.level : ground_z;
     }
 
     return VMAP_INVALID_HEIGHT_VALUE;
-- 
cgit v1.2.3