mirror of
https://github.com/mangosfour/server.git
synced 2025-12-19 13:37:01 +00:00
[6933] Fixed resurrected players being attacked by creatures near their corpse although they were revived in a safe distance
This commit is contained in:
parent
7cc95eefb2
commit
513255585f
2 changed files with 4 additions and 3 deletions
|
|
@ -18597,6 +18597,9 @@ uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const
|
||||||
|
|
||||||
void Player::ResurectUsingRequestData()
|
void Player::ResurectUsingRequestData()
|
||||||
{
|
{
|
||||||
|
/// Teleport before resurrecting, otherwise the player might get attacked from creatures near his corpse
|
||||||
|
TeleportTo(m_resurrectMap, m_resurrectX, m_resurrectY, m_resurrectZ, GetOrientation());
|
||||||
|
|
||||||
ResurrectPlayer(0.0f,false);
|
ResurrectPlayer(0.0f,false);
|
||||||
|
|
||||||
if(GetMaxHealth() > m_resurrectHealth)
|
if(GetMaxHealth() > m_resurrectHealth)
|
||||||
|
|
@ -18614,8 +18617,6 @@ void Player::ResurectUsingRequestData()
|
||||||
SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY) );
|
SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY) );
|
||||||
|
|
||||||
SpawnCorpseBones();
|
SpawnCorpseBones();
|
||||||
|
|
||||||
TeleportTo(m_resurrectMap, m_resurrectX, m_resurrectY, m_resurrectZ, GetOrientation());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Player::SetClientControl(Unit* target, uint8 allowMove)
|
void Player::SetClientControl(Unit* target, uint8 allowMove)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "6932"
|
#define REVISION_NR "6933"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue