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

Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h

2 files changed, 4 insertions, 9 deletions

diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 94b5f3607cf..3437355c0a9 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -171,19 +171,14 @@ namespace MMAP
     {
         while (1)
         {
-            uint32* mapId = nullptr;
+            uint32 mapId;
 
             _queue.WaitAndPop(mapId);
 
             if (_cancelationToken)
                 return;
 
-            if (!mapId) // shouldn't happen?
-                continue;
-
-            buildMap(*mapId);
-
-            delete mapId;
+            buildMap(mapId);
         }
     }
 
@@ -205,7 +200,7 @@ namespace MMAP
             if (!shouldSkipMap(mapId))
             {
                 if (threads > 0)
-                    _queue.Push(new uint32(mapId));
+                    _queue.Push(mapId);
                 else
                     buildMap(mapId);
             }
diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
index c2168d048b4..1d688ccfa77 100644
--- a/src/tools/mmaps_generator/MapBuilder.h
+++ b/src/tools/mmaps_generator/MapBuilder.h
@@ -143,7 +143,7 @@ namespace MMAP
             rcContext* m_rcContext;
 
             std::vector<std::thread> _workerThreads;
-            ProducerConsumerQueue<uint32*> _queue;
+            ProducerConsumerQueue<uint32> _queue;
             std::atomic<bool> _cancelationToken;
     };
 }