Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Conflicts:
	dep/PackageList.txt
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h

1 files changed, 8 insertions, 2 deletions

diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
index e7693a70de4..207b652a4d6 100644
--- a/src/server/collision/Maps/TileAssembler.cpp
+++ b/src/server/collision/Maps/TileAssembler.cpp
@@ -312,7 +312,7 @@ namespace VMAP
         // write WorldModel
         WorldModel model;
         model.setRootWmoID(raw_model.RootWMOID);
-        if (raw_model.groupsArray.size())
+        if (!raw_model.groupsArray.empty())
         {
             std::vector<GroupModel> groupsArray;
 
@@ -336,9 +336,15 @@ namespace VMAP
     void TileAssembler::exportGameobjectModels()
     {
         FILE* model_list = fopen((iSrcDir + "/" + "temp_gameobject_models").c_str(), "rb");
+        if (!model_list)
+            return;
+
         FILE* model_list_copy = fopen((iDestDir + "/" + GAMEOBJECT_MODELS).c_str(), "wb");
-        if (!model_list || !model_list_copy)
+        if (!model_list_copy)
+        {
+            fclose(model_list);
             return;
+        }
 
         uint32 name_length, displayId;
         char buff[500];