Commit
Original patch provided by zergtmn.
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8372,23 +8372,29 @@ void Unit::setDeathState(DeathState s) | |
bool Unit::CanHaveThreatList() const | ||
{ | ||
// only creatures can have threat list | ||
if( GetTypeId() != TYPEID_UNIT ) | ||
if (GetTypeId() != TYPEID_UNIT) | ||
return false; | ||
|
||
// only alive units can have threat list | ||
if( !isAlive() ) | ||
if (!isAlive()) | ||
return false; | ||
|
||
Creature const* creature = ((Creature const*)this); | ||
|
||
// totems can not have threat list | ||
if( ((Creature*)this)->isTotem() ) | ||
if (creature->isTotem()) | ||
return false; | ||
|
||
// vehicles can not have threat list | ||
if( ((Creature*)this)->isVehicle() ) | ||
if (creature->isVehicle()) | ||
return false; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
Laise
Contributor
|
||
|
||
// pets can not have a threat list, unless they are controlled by a creature | ||
if( ((Creature*)this)->isPet() && IS_PLAYER_GUID(((Pet*)this)->GetOwnerGUID()) ) | ||
if (creature->isPet() && IS_PLAYER_GUID(((Pet const*)creature)->GetOwnerGUID())) | ||
return false; | ||
|
||
// charmed units can not have a threat list if charmed by player | ||
if (creature->isCharmed() && IS_PLAYER_GUID(creature->GetCharmerGUID())) | ||
return false; | ||
|
||
return true; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#ifndef __REVISION_NR_H__ | ||
#define __REVISION_NR_H__ | ||
#define REVISION_NR "10563" | ||
#define REVISION_NR "10564" | ||
#endif // __REVISION_NR_H__ |
It's wrong. Vehicles (not in this sources, but in principle) may have threatlist, examples - bosses Gormok the Impaler (TOC), Professor Putricide and Saurfang (ICC). This creatures is vehicles (see sniffs).