mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crash fix

Browse source
This commit is contained in:
tomrus88 2008-10-31 00:13:56 +03:00
parent 5ca92eddd7
commit 6707038cfc
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/game/QueryHandler.cpp
View file

@ -273,7 +273,13 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
Corpse *corpse = GetPlayer()->GetCorpse(); Corpse *corpse = GetPlayer()->GetCorpse();
uint8 found = corpse ? 1 : 0; if(!corpse)
{
WorldPacket data(MSG_CORPSE_QUERY, 1);
data << uint8(0); // corpse not found
SendPacket(&data);
return;
}
int32 mapid = corpse->GetMapId(); int32 mapid = corpse->GetMapId();
float x = corpse->GetPositionX(); float x = corpse->GetPositionX();
@ -281,35 +287,29 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
float z = corpse->GetPositionZ(); float z = corpse->GetPositionZ();
int32 corpsemapid = _player->GetMapId(); int32 corpsemapid = _player->GetMapId();
if(found) if(Map *map = corpse->GetMap())
{ {
if(Map *map = corpse->GetMap()) if(map->IsDungeon())
{ {
if(map->IsDungeon()) if(!map->GetEntrancePos(mapid, x, y))
{ return;
if(!map->GetEntrancePos(mapid, x, y))
return;
Map *entrance_map = MapManager::Instance().GetMap(mapid, _player); Map *entrance_map = MapManager::Instance().GetMap(mapid, _player);
if(!entrance_map) if(!entrance_map)
return; return;
z = entrance_map->GetHeight(x, y, MAX_HEIGHT); z = entrance_map->GetHeight(x, y, MAX_HEIGHT);
corpsemapid = corpse->GetMapId(); corpsemapid = corpse->GetMapId();
}
} }
} }
WorldPacket data(MSG_CORPSE_QUERY, (1+found*(5*4))); WorldPacket data(MSG_CORPSE_QUERY, 1+(5*4));
data << uint8(found); data << uint8(1); // corpse found
if(found) data << int32(mapid);
{ data << float(x);
data << int32(mapid); data << float(y);
data << float(x); data << float(z);
data << float(y); data << int32(corpsemapid);
data << float(z);
data << int32(corpsemapid);
}
SendPacket(&data); SendPacket(&data);
} }