Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Reduce differences between branches

Browse Source
This commit is contained in:
Shauren
2025-02-20 23:57:25 +01:00
parent 12197b7cff
commit ff6a107ac0
8 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/Handlers/QueryHandler.cpp
View File

@@ -31,6 +31,7 @@
#include "QueryPackets.h"
#include "RealmList.h"
#include "TerrainMgr.h"
#include "Transport.h"
#include "World.h"
void WorldSession::BuildNameQueryData(ObjectGuid guid, WorldPackets::Query::NameCacheLookupResult& lookupData)
@@ -168,7 +169,7 @@ void WorldSession::HandleQueryCorpseLocation(WorldPackets::Query::QueryCorpseLoc
packet.MapID = corpseMapID;
packet.ActualMapID = mapID;
packet.Position = Position(x, y, z);
packet.Transport = ObjectGuid::Empty;
packet.Transport = ObjectGuid::Empty; // TODO: If corpse is on transport, send transport offsets and transport guid
SendPacket(packet.Write());
}
@@ -236,13 +237,18 @@ void WorldSession::HandleQueryCorpseTransport(WorldPackets::Query::QueryCorpseTr
{
WorldPackets::Query::CorpseTransportQuery response;
response.Player = queryCorpseTransport.Player;
if (Player* player = ObjectAccessor::FindConnectedPlayer(queryCorpseTransport.Player))
if (Player* player = ObjectAccessor::FindConnectedPlayer(queryCorpseTransport.Player); player && _player->IsInSameRaidWith(player))
{
Corpse* corpse = player->GetCorpse();
if (_player->IsInSameRaidWith(player) && corpse && !corpse->GetTransGUID().IsEmpty() && corpse->GetTransGUID() == queryCorpseTransport.Transport)
if (Corpse const* corpse = _player->GetCorpse())
{
response.Position = corpse->GetTransOffset();
response.Facing = corpse->GetTransOffsetO();
if (Transport const* transport = dynamic_cast<Transport const*>(corpse->GetTransport()))
{
if (transport->GetGUID() == queryCorpseTransport.Transport)
{
response.Position = transport->GetPosition();
response.Facing = transport->GetOrientation();
}
}
}
}