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

[10922] Revert "[8722] Fixed possible creash."

Browse source 
This reverts commit 8dd3e4b31a31bb6dfc4d9fb51b1b7e67bad4ca16.

This is impossible crash case. Creature object can't be created without creatureInfo != NULL
So crash source can be only result wrong calling ClearInCombat() for deleted or NULL creature.
This commit is contained in:
VladimirMangos 2010-12-27 05:05:30 +03:00
parent 246126d7b4
commit 3c58f25ad9
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/Unit.cpp
View file

@ -7731,8 +7731,7 @@ void Unit::ClearInCombat()
// Player's state will be cleared in Player::UpdateContestedPvP // Player's state will be cleared in Player::UpdateContestedPvP
if (GetTypeId() != TYPEID_PLAYER) if (GetTypeId() != TYPEID_PLAYER)
{ {
Creature* creature = (Creature*)this; if (((Creature*)this)->GetCreatureInfo()->unit_flags & UNIT_FLAG_OOC_NOT_ATTACKABLE)
if (creature->GetCreatureInfo() && creature->GetCreatureInfo()->unit_flags & UNIT_FLAG_OOC_NOT_ATTACKABLE)
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
clearUnitState(UNIT_STAT_ATTACK_PLAYER); clearUnitState(UNIT_STAT_ATTACK_PLAYER);

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 "10921" #define REVISION_NR "10922"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__