4 files changed, 3 insertions, 8 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index d96eb9b551e..2c77d8df04d 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -653,9 +653,7 @@ void WorldSession::SendChatPlayerNotfoundNotice(std::string const& name)
 
 void WorldSession::SendPlayerAmbiguousNotice(std::string const& name)
 {
-    WorldPackets::Chat::ChatPlayerAmbiguous packet;
-    packet.Name = name;
-    SendPacket(packet.Write());
+    SendPacket(WorldPackets::Chat::ChatPlayerAmbiguous(name).Write());
 }
 
 void WorldSession::SendChatRestricted(ChatRestrictionType restriction)
diff --git a/src/server/game/Server/Packets/ChatPackets.h b/src/server/game/Server/Packets/ChatPackets.h
index 277892c1495..faa060b3c0f 100644
--- a/src/server/game/Server/Packets/ChatPackets.h
+++ b/src/server/game/Server/Packets/ChatPackets.h
@@ -304,7 +304,7 @@ namespace WorldPackets
         class ChatPlayerAmbiguous final : public ServerPacket
         {
         public:
-            ChatPlayerAmbiguous() : ServerPacket(SMSG_CHAT_PLAYER_AMBIGUOUS, 2 + Name.length()) { }
+            ChatPlayerAmbiguous(std::string const& name) : ServerPacket(SMSG_CHAT_PLAYER_AMBIGUOUS, 2 + name.length()), Name(name) { }
 
             WorldPacket const* Write() override;
 
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 58435a51121..32fccaa2038 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -14,7 +14,6 @@ file(GLOB_RECURSE sources *.cpp *.h)
 include_directories (
   ${CMAKE_SOURCE_DIR}/dep/CascLib/src
   ${CMAKE_SOURCE_DIR}/dep/cppformat
-  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
   ${CMAKE_SOURCE_DIR}/src/common
   ${CMAKE_SOURCE_DIR}/src/common/Utilities
   ${CMAKE_SOURCE_DIR}/src/server/shared
@@ -32,7 +31,6 @@ target_link_libraries(mapextractor
   casc
   common
   format
-  g3dlib
   ${BZIP2_LIBRARIES}
   ${ZLIB_LIBRARIES}
   ${Boost_LIBRARIES}
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 9b6f81a29af..22a8cc72c3c 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -40,8 +40,6 @@
 #include "adt.h"
 #include "wdt.h"
 
-#include <G3D/Plane.h>
-
 namespace
 {
     const char* HumanReadableCASCError(int error)
@@ -705,6 +703,7 @@ bool ConvertADT(std::string const& inputPath, std::string const& outputPath, int
 
     if (FileChunk* chunk = adt.GetChunk("MFBO"))
     {
+        adt_MFBO* mfbo = chunk->As<adt_MFBO>();
         memcpy(flight_box_max, &mfbo->max, sizeof(flight_box_max));
         memcpy(flight_box_min, &mfbo->min, sizeof(flight_box_min));
         hasFlightBox = true;