mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-20 09:17:36 +01:00
Auras with turn/move interrupt flags are now removed for creatures when they turn/move, cleanup
--HG-- branch : trunk
This commit is contained in:
@@ -215,7 +215,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
|
||||
|
||||
WorldLocation const& dest = plMover->GetTeleportDest();
|
||||
|
||||
plMover->SetPosition(dest, true);
|
||||
plMover->SetPosition(dest);
|
||||
|
||||
uint32 newzone, newarea;
|
||||
plMover->GetZoneAndAreaId(newzone, newarea);
|
||||
@@ -365,20 +365,6 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
|
||||
plMover->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
|
||||
plMover->UpdateFallInformationIfNeed(movementInfo, opcode);
|
||||
|
||||
// If on vehicle, update carried players
|
||||
if (Vehicle *vehicle=plMover->GetVehicleKit())
|
||||
{
|
||||
if (plMover->IsVehicle())
|
||||
{
|
||||
for (int i=0; i < 8; ++i)
|
||||
{
|
||||
if (Unit *passenger = vehicle->GetPassenger(i))
|
||||
if (passenger != NULL && passenger->GetTypeId() == TYPEID_PLAYER)
|
||||
((Player*)passenger)->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (movementInfo.z < -500.0f)
|
||||
{
|
||||
if (plMover->InBattleGround()
|
||||
@@ -412,7 +398,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
|
||||
}
|
||||
else // creature charmed
|
||||
{
|
||||
mover->GetMap()->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
|
||||
mover->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
|
||||
|
||||
/*if(mover->canFly())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user