From 761c82e65ae01e56d0efc7a7ba0dabdb2e44c5a7 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 9 Feb 2016 19:18:05 +0100
Subject: Core/Maps: Use IsValidMapCoord for checking Z coord instead of just
 std::isfinite - only acceptable values are between -17066.6656 and 17066.6656

(cherry picked from commit 4d956c89fc6f20c546a396573cf42aa97b844c09)
---
 src/server/game/Achievements/AchievementMgr.cpp |  3 ---
 src/server/game/Grids/GridDefines.h             |  2 +-
 src/server/scripts/Commands/cs_misc.cpp         | 14 --------------
 3 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 596329e9499..ac8e0298a44 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -1909,9 +1909,6 @@ bool AchievementMgr::RequirementsSatisfied(AchievementCriteriaEntry const* achie
                 if (!area)
                     break;
 
-                if (area->exploreFlag < 0)
-                    continue;
-
                 uint32 playerIndexOffset = uint32(area->exploreFlag) / 32;
                 if (playerIndexOffset >= PLAYER_EXPLORED_ZONES_SIZE)
                     continue;
diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 162c39b951b..24c9100b222 100644
--- a/src/server/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
@@ -226,7 +226,7 @@ namespace Trinity
 
     inline bool IsValidMapCoord(float x, float y, float z)
     {
-        return IsValidMapCoord(x, y) && std::isfinite(z);
+        return IsValidMapCoord(x, y) && IsValidMapCoord(z);
     }
 
     inline bool IsValidMapCoord(float x, float y, float z, float o)
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 8ebbba784df..c70246f7fb5 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -1060,13 +1060,6 @@ public:
             return false;
         }
 
-        if (area->exploreFlag < 0)
-        {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
-            return false;
-        }
-
         int32 offset = area->exploreFlag / 32;
         if (offset >= PLAYER_EXPLORED_ZONES_SIZE)
         {
@@ -1104,13 +1097,6 @@ public:
             return false;
         }
 
-        if (area->exploreFlag < 0)
-        {
-            handler->SendSysMessage(LANG_BAD_VALUE);
-            handler->SetSentErrorMessage(true);
-            return false;
-        }
-
         int32 offset = area->exploreFlag / 32;
         if (offset >= PLAYER_EXPLORED_ZONES_SIZE)
         {
-- 
cgit v1.2.3