Added some missing SetFallInformation calls

Port From (https://github.com/TrinityCore/TrinityCore/commit/cfefd27cb8171b7fe28781eb8f1d903272830f22)
This commit is contained in:
hondacrx
2019-08-17 12:54:12 -04:00
parent 0a29281557
commit a89ace13c8
6 changed files with 31 additions and 6 deletions
+10 -3
View File
@@ -305,8 +305,12 @@ namespace Game.Entities
passenger.m_movementInfo.transport.Reset();
Log.outDebug(LogFilter.Transport, "Object {0} removed from transport {1}.", passenger.GetName(), GetName());
if (passenger.IsTypeId(TypeId.Player))
Global.ScriptMgr.OnRemovePassenger(this, passenger.ToPlayer());
Player plr = passenger.ToPlayer();
if (plr != null)
{
Global.ScriptMgr.OnRemovePassenger(this, plr);
plr.SetFallInformation(0, plr.GetPositionZ());
}
}
}
@@ -727,8 +731,11 @@ namespace Game.Entities
break;
}
case TypeId.Player:
if (passenger.IsInWorld)
if (passenger.IsInWorld && !passenger.ToPlayer().IsBeingTeleported())
{
GetMap().PlayerRelocation(passenger.ToPlayer(), x, y, z, o);
passenger.ToPlayer().SetFallInformation(0, passenger.GetPositionZ());
}
break;
case TypeId.GameObject:
GetMap().GameObjectRelocation(passenger.ToGameObject(), x, y, z, o, false);