Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Paul Coene
2017-07-07 09:28:20 -04:00
3 changed files with 20 additions and 12 deletions
+4
View File
@@ -1003,6 +1003,10 @@ void Mob::AI_Process() {
if (DistanceNoZ(this->GetPosition(), this->GetTarget()->GetPosition()) > 50) {
this->FixZ();
}
/* If we are close to client and our Z differences aren't big, match the client */
else if (std::abs(this->GetZ() - this->GetTarget()->GetZ()) <= 5 && this->GetTarget()->IsClient()) {
this->m_Position.z = this->GetTarget()->GetZ();
}
}
if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)))