diff options
author | Treeston <treeston.mmoc@gmail.com> | 2016-04-16 10:43:57 +0200 |
---|---|---|
committer | Treeston <treeston.mmoc@gmail.com> | 2016-04-16 10:43:57 +0200 |
commit | 9ad952c3bc87a03cc39c2c44a301857b8f62df7c (patch) | |
tree | 262e5b3ff39ad0e2bc3819eb4cad497331808d81 /src | |
parent | 37067ad3905059753f38254e72dae62cd2db2ce6 (diff) | |
parent | 10550fe8cff1fb91c8084b623fe243a6340ea52d (diff) |
Merge pull request #16736 from r00ty-tc/map_height
Solve many of the creature falling through floor issues.
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Maps/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 664ed3dc8ec..794be12ee7c 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2345,9 +2345,9 @@ float Map::GetHeight(float x, float y, float z, bool checkVMap /*= true*/, float { // we have mapheight and vmapheight and must select more appropriate - // we are already under the surface or vmap height above map heigt + // vmap height above map height // or if the distance of the vmap height is less the land height distance - if (z < mapHeight || vmapHeight > mapHeight || std::fabs(mapHeight - z) > std::fabs(vmapHeight - z)) + if (vmapHeight > mapHeight || std::fabs(mapHeight - z) > std::fabs(vmapHeight - z)) return vmapHeight; else return mapHeight; // better use .map surface height |