diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 8969a4616..c20bb2583 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1871,7 +1871,7 @@ bool Creature::IsOutOfThreatArea(Unit* pVictim) const float ThreatRadius = sWorld.getConfig(CONFIG_FLOAT_THREAT_RADIUS); //Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and out of combat every update tick. - return !pVictim->IsWithinDist3d(CombatStartX, CombatStartY, CombatStartZ, + return !pVictim->IsWithinDist3d(m_combatStartX, m_combatStartY, m_combatStartZ, ThreatRadius > AttackDist ? ThreatRadius : AttackDist); } diff --git a/src/game/Creature.h b/src/game/Creature.h index 4dbc3c21a..a6d941dc7 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -671,8 +671,8 @@ class MANGOS_DLL_SPEC Creature : public Unit return m_charmInfo->GetCharmSpell(pos)->GetAction(); } - void SetCombatStartPosition(float x, float y, float z) { CombatStartX = x; CombatStartY = y; CombatStartZ = z; } - void GetCombatStartPosition(float &x, float &y, float &z) { x = CombatStartX; y = CombatStartY; z = CombatStartZ; } + void SetCombatStartPosition(float x, float y, float z) { m_combatStartX = x; m_combatStartY = y; m_combatStartZ = z; } + void GetCombatStartPosition(float &x, float &y, float &z) { x = m_combatStartX; y = m_combatStartY; z = m_combatStartZ; } void SetSummonPoint(CreatureCreatePos const& pos) { m_summonXpoint = pos.m_pos.x; m_summonYpoint = pos.m_pos.y; m_summonZpoint = pos.m_pos.z; m_summonOrientation = pos.m_pos.o; } void GetSummonPoint(float &fX, float &fY, float &fZ, float &fOrient) const { fX = m_summonXpoint; fY = m_summonYpoint; fZ = m_summonZpoint; fOrient = m_summonOrientation; } @@ -728,9 +728,9 @@ class MANGOS_DLL_SPEC Creature : public Unit SpellSchoolMask m_meleeDamageSchoolMask; uint32 m_originalEntry; - float CombatStartX; - float CombatStartY; - float CombatStartZ; + float m_combatStartX; + float m_combatStartY; + float m_combatStartZ; float m_summonXpoint; float m_summonYpoint; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d705375d0..54052a5e1 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 "11312" + #define REVISION_NR "11313" #endif // __REVISION_NR_H__