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

[7260] Fixed access to uninitilized fields in FleeingMovementGenerator and Creature::IsOutOfThreatArea.

Browse source
This commit is contained in:
VladimirMangos 2009-02-10 06:20:32 +03:00
parent 63b8d1f537
commit 09bf9260cb
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/game/FleeingMovementGenerator.cpp
View file

@ -283,15 +283,22 @@ FleeingMovementGenerator<T>::Initialize(T &owner)
if(!&owner) if(!&owner)
return; return;
Unit * fright = ObjectAccessor::GetUnit(owner, i_frightGUID);
if(!fright)
return;
_Init(owner); _Init(owner);
owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
i_caster_x = fright->GetPositionX();
i_caster_y = fright->GetPositionY(); if(Unit * fright = ObjectAccessor::GetUnit(owner, i_frightGUID))
i_caster_z = fright->GetPositionZ(); {
i_caster_x = fright->GetPositionX();
i_caster_y = fright->GetPositionY();
i_caster_z = fright->GetPositionZ();
}
else
{
i_caster_x = owner.GetPositionX();
i_caster_y = owner.GetPositionY();
i_caster_z = owner.GetPositionZ();
}
i_only_forward = true; i_only_forward = true;
i_cur_angle = 0.0f; i_cur_angle = 0.0f;
i_last_distance_from_caster = 0.0f; i_last_distance_from_caster = 0.0f;

6
src/game/Unit.cpp
View file

@ -7112,6 +7112,11 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
if(meleeAttack) if(meleeAttack)
addUnitState(UNIT_STAT_MELEE_ATTACKING); addUnitState(UNIT_STAT_MELEE_ATTACKING);
// set position before any AI calls/assistance
if(GetTypeId()==TYPEID_UNIT)
((Creature*)this)->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
m_attacking = victim; m_attacking = victim;
m_attacking->_addAttacker(this); m_attacking->_addAttacker(this);
@ -7126,7 +7131,6 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
((WorldObject*)this)->SendMessageToSet(&data, true); ((WorldObject*)this)->SendMessageToSet(&data, true);
((Creature*)this)->CallAssistance(); ((Creature*)this)->CallAssistance();
((Creature*)this)->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
} }
// delay offhand weapon attack to next attack time // delay offhand weapon attack to next attack time

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 "7259" #define REVISION_NR "7260"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__