mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-06 12:12:25 +00:00
Merge pull request #1193 from noudess/gmmove
Use heading in GMMove and change FaceTarget not to turn boat
This commit is contained in:
commit
7eba9552e2
@ -1734,6 +1734,7 @@ void Mob::GMMove(float x, float y, float z, float heading, bool SendUpdate) {
|
|||||||
m_Position.x = x;
|
m_Position.x = x;
|
||||||
m_Position.y = y;
|
m_Position.y = y;
|
||||||
m_Position.z = z;
|
m_Position.z = z;
|
||||||
|
SetHeading(heading);
|
||||||
mMovementManager->SendCommandToClients(this, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeAny);
|
mMovementManager->SendCommandToClients(this, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeAny);
|
||||||
|
|
||||||
if (IsNPC()) {
|
if (IsNPC()) {
|
||||||
@ -2820,6 +2821,11 @@ bool Mob::HateSummon() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Mob::FaceTarget(Mob* mob_to_face /*= 0*/) {
|
void Mob::FaceTarget(Mob* mob_to_face /*= 0*/) {
|
||||||
|
|
||||||
|
if (IsBoat()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Mob* faced_mob = mob_to_face;
|
Mob* faced_mob = mob_to_face;
|
||||||
if(!faced_mob) {
|
if(!faced_mob) {
|
||||||
if(!GetTarget()) {
|
if(!GetTarget()) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user