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

[11930] Fix Pet behaviour for environmental damage

Browse source 
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
Schmoozerd 2012-03-28 22:13:52 +02:00
parent a8c5ba581c
commit af47f39a4e
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Unit.cpp
View file

@ -5686,6 +5686,10 @@ void Unit::AttackedBy(Unit* attacker)
if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI()) if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI())
((Creature*)this)->AI()->AttackedBy(attacker); ((Creature*)this)->AI()->AttackedBy(attacker);
// do not pet reaction for self inflicted damage (like environmental)
if (attacker == this)
return;
// trigger pet AI reaction // trigger pet AI reaction
if (Pet* pet = GetPet()) if (Pet* pet = GetPet())
pet->AttackedBy(attacker); pet->AttackedBy(attacker);

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 "11929" #define REVISION_NR "11930"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__