Core/MMaps: Removed an incorrect call to GetHeight

Tools/MeshExtractor: Fixed a crash caused by calling fclose in a NULL stream

2 files changed, 3 insertions, 6 deletions

diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp
index 9635399e71f..6e765b1ee27 100644
--- a/src/server/game/Movement/PathGenerator.cpp
+++ b/src/server/game/Movement/PathGenerator.cpp
@@ -58,12 +58,8 @@ bool PathGenerator::CalculatePath(float destX, float destY, float destZ, bool fo
     if (!Trinity::IsValidMapCoord(destX, destY, destZ) || !Trinity::IsValidMapCoord(x, y, z))
         return false;
 
-    float newDestZ = _sourceUnit->GetBaseMap()->GetHeight(_sourceUnit->GetPhaseMask(), x, y, z, true, MAX_FALL_DISTANCE);
-    if (newDestZ <= INVALID_HEIGHT)
-        return false;
-
     Vector3 oldDest = GetEndPosition();
-    Vector3 dest(destX, destY, newDestZ);
+    Vector3 dest(destX, destY, destZ);
     SetEndPosition(dest);
 
     Vector3 start(x, y, z);
diff --git a/src/tools/mesh_extractor/ChunkedData.cpp b/src/tools/mesh_extractor/ChunkedData.cpp
index 35b1bcd5af0..4c59217ed33 100644
--- a/src/tools/mesh_extractor/ChunkedData.cpp
+++ b/src/tools/mesh_extractor/ChunkedData.cpp
@@ -68,5 +68,6 @@ ChunkedData::~ChunkedData()
 		delete *itr;
 	
 	Chunks.clear();
-	fclose(Stream);
+	if (Stream)
+		fclose(Stream);
 }