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

[9191] Fixed crashes related to recently totem acccess function

Browse source 
* No search if not in world (no totems then)
* Check NULL.
This commit is contained in:
VladimirMangos 2010-01-16 18:15:26 +03:00
parent 5a4944385e
commit c6d378ad70
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Unit.cpp
View file

@ -8449,11 +8449,11 @@ Unit* Unit::_GetTotem(uint8 slot) const
Totem* Unit::GetTotem( uint8 slot ) const Totem* Unit::GetTotem( uint8 slot ) const
{ {
if(slot >= MAX_TOTEM) if(slot >= MAX_TOTEM || !IsInWorld())
return NULL; return NULL;
Creature *totem = GetMap()->GetCreature(m_TotemSlot[slot]); Creature *totem = GetMap()->GetCreature(m_TotemSlot[slot]);
return totem->isTotem() ? (Totem*)totem : NULL; return totem && totem->isTotem() ? (Totem*)totem : NULL;
} }
void Unit::UnsummonAllTotems() void Unit::UnsummonAllTotems()

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 "9190" #define REVISION_NR "9191"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__