From af47f39a4e293fee9da1b75559bd65213e4c3557 Mon Sep 17 00:00:00 2001 From: Schmoozerd Date: Wed, 28 Mar 2012 22:13:52 +0200 Subject: [PATCH] [11930] Fix Pet behaviour for environmental damage Signed-off-by: Schmoozerd --- src/game/Unit.cpp | 4 ++++ src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 27f398ca2..9248840aa 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5686,6 +5686,10 @@ void Unit::AttackedBy(Unit* attacker) if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->AI()) ((Creature*)this)->AI()->AttackedBy(attacker); + // do not pet reaction for self inflicted damage (like environmental) + if (attacker == this) + return; + // trigger pet AI reaction if (Pet* pet = GetPet()) pet->AttackedBy(attacker); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b67ca2090..806932e48 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11929" + #define REVISION_NR "11930" #endif // __REVISION_NR_H__