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

[12673] Let Taunt behave more expectedly in case we have non-generic orientation settings

Browse source
This commit is contained in:
Schmoozerd 2013-08-19 16:28:29 +03:00 • committed by Antz
parent e269f49f8e
commit de2cc58be9
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Unit.cpp
View file

@ -9224,7 +9224,8 @@ void Unit::TauntApply(Unit* taunter)
// Only attack taunter if this is a valid target // Only attack taunter if this is a valid target
if (!hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_DIED) && !IsSecondChoiceTarget(taunter, true)) if (!hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_DIED) && !IsSecondChoiceTarget(taunter, true))
{ {
SetInFront(taunter); if (GetTargetGuid() || !target)
SetInFront(taunter);
if (((Creature*)this)->AI()) if (((Creature*)this)->AI())
((Creature*)this)->AI()->AttackStart(taunter); ((Creature*)this)->AI()->AttackStart(taunter);
@ -9271,7 +9272,8 @@ void Unit::TauntFadeOut(Unit* taunter)
if (target && target != taunter) if (target && target != taunter)
{ {
SetInFront(target); if (GetTargetGuid())
SetInFront(target);
if (((Creature*)this)->AI()) if (((Creature*)this)->AI())
((Creature*)this)->AI()->AttackStart(target); ((Creature*)this)->AI()->AttackStart(target);

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 "12672" #define REVISION_NR "12673"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__