*Grobbulus - in Inject event, tank is not a target for this spell, by Gyullo

*Gundrak - AI for the boss Moorabi, by Manuel
*Improvements to player death handling (they will now fall to the ground).. also attempted to improve creature death handling the same way.

--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-25 19:20:04 -07:00
parent 0febe02227
commit 2853aa1cd1
9 changed files with 175 additions and 42 deletions
+19
View File
@@ -4442,8 +4442,27 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
}
}
bool Player::FallGround(bool noDeath/* = false*/)
{
// Let's abort after we called this function one time
if (getDeathState() == DEAD_FALLING && !noDeath)
return false;
float x, y, z;
GetPosition(x, y, z);
float ground_Z = GetMap()->GetVmapHeight(x, y, z, true);
if (fabs(ground_Z - z) < 0.1f)
return false;
GetMotionMaster()->MoveFall(ground_Z, EVENT_FALL_GROUND);
if(!noDeath) Unit::setDeathState(DEAD_FALLING);
return true;
}
void Player::KillPlayer()
{
if(IsFlying()) FallGround();
SetMovement(MOVE_ROOT);
StopMirrorTimers(); //disable timers(bars)