Core/Scripts: multiple changes

- fixed non pch build
- fixed some warnings
- fixed some coverity issues
- some random things here and there

1 files changed, 3 insertions, 4 deletions

diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp
index ce4a9fa4e66..c662be65334 100644
--- a/src/server/game/Handlers/QueryHandler.cpp
+++ b/src/server/game/Handlers/QueryHandler.cpp
@@ -135,11 +135,10 @@ void WorldSession::HandleCreatureQuery(WorldPackets::Query::QueryCreature& packe
 void WorldSession::HandleGameObjectQueryOpcode(WorldPackets::Query::QueryGameObject& packet)
 {
     WorldPackets::Query::QueryGameObjectResponse response;
-    GameObjectTemplate const* gameObjectInfo = sObjectMgr->GetGameObjectTemplate(packet.Entry);
 
-    response.Entry = packet.Entry;
+    response.GameObjectID = packet.GameObjectID;
 
-    if (gameObjectInfo)
+    if (GameObjectTemplate const* gameObjectInfo = sObjectMgr->GetGameObjectTemplate(packet.GameObjectID))
     {
         response.Allow = true;
         WorldPackets::Query::GameObjectStats& stats = response.Stats;
@@ -419,7 +418,7 @@ void WorldSession::HandleDBQueryBulk(WorldPackets::Query::DBQueryBulk& packet)
         return;
     }
 
-    for (WorldPackets::Query::DBQueryRecord const& rec : packet.Queries)
+    for (WorldPackets::Query::DBQueryBulk::DBQueryRecord const& rec : packet.Queries)
     {
         WorldPackets::Query::DBReply response;
         response.TableHash = packet.TableHash;