diff options
author | Kandera <KanderaDev@gmail.com> | 2012-02-17 14:25:08 -0500 |
---|---|---|
committer | Kandera <KanderaDev@gmail.com> | 2012-02-17 14:25:08 -0500 |
commit | e277588689499f35c91014dbda1b76cb8ab69e2c (patch) | |
tree | 5a425d99a336f642ee68d0ddc7f8ba7968119cab | |
parent | 1b506c18eed61bc363d358d0e00fac7e9ce77528 (diff) |
fix blink making you fall under ground when blinking into water (needs correct liquid level calculations)
-rwxr-xr-x | src/server/game/Maps/Map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |