Core/Vmaps: Made code more safe and fixed problems in WmoLiquid::GetLiquidHeight()

1 files changed, 4 insertions, 2 deletions

diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp
index f639b5fc3f4..325594fd6be 100644
--- a/src/server/collision/Models/WorldModel.cpp
+++ b/src/server/collision/Models/WorldModel.cpp
@@ -149,10 +149,12 @@ namespace VMAP
     {
         float tx_f = (pos.x - iCorner.x)/LIQUID_TILE_SIZE;
         uint32 tx = uint32(tx_f);
-        if (tx >= iTilesX) return false;
+        if (tx_f < 0.0f || tx >= iTilesX)
+            return false;
         float ty_f = (pos.y - iCorner.y)/LIQUID_TILE_SIZE;
         uint32 ty = uint32(ty_f);
-        if (ty >= iTilesY) return false;
+        if (ty_f < 0.0f || ty >= iTilesY)
+            return false;
 
         // check if tile shall be used for liquid level
         // checking for 0x08 *might* be enough, but disabled tiles always are 0x?F: