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

[6977] Fixed a crash caused by incorrect use of GetMap for corpses in other maps, and another one caused by SelectHostilTarget failing to notice the target is not in world, due to a fauly InSameMap check.

Browse source
This commit is contained in:
Wyk3d 2008-12-29 21:16:12 +02:00
parent 75b1db8cd0
commit 07394d45da
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Object.h
View file

@ -416,7 +416,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
float GetDistance2d(const WorldObject* obj) const; float GetDistance2d(const WorldObject* obj) const;
float GetDistance2d(const float x, const float y) const; float GetDistance2d(const float x, const float y) const;
float GetDistanceZ(const WorldObject* obj) const; float GetDistanceZ(const WorldObject* obj) const;
bool IsInMap(const WorldObject* obj) const { return GetMapId()==obj->GetMapId() && GetInstanceId()==obj->GetInstanceId(); } bool IsInMap(const WorldObject* obj) const { return IsInWorld() && obj->IsInWorld() && GetMapId()==obj->GetMapId() && GetInstanceId()==obj->GetInstanceId(); }
bool IsWithinDistInMap(const WorldObject* obj, const float dist2compare, const bool is3D = true) const; bool IsWithinDistInMap(const WorldObject* obj, const float dist2compare, const bool is3D = true) const;
bool IsWithinLOS(const float x, const float y, const float z ) const; bool IsWithinLOS(const float x, const float y, const float z ) const;
bool IsWithinLOSInMap(const WorldObject* obj) const; bool IsWithinLOSInMap(const WorldObject* obj) const;

2
src/game/QueryHandler.cpp
View file

@ -289,7 +289,7 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
float z = corpse->GetPositionZ(); float z = corpse->GetPositionZ();
int32 corpsemapid = _player->GetMapId(); int32 corpsemapid = _player->GetMapId();
if(Map *map = corpse->GetMap()) if(Map *map = MapManager::Instance().FindMap(corpse->GetMapId(), corpse->GetInstanceId()))
{ {
if(map->IsDungeon()) if(map->IsDungeon())
{ {

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "6976" #define REVISION_NR "6977"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__