mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7533] Redirect movement packet in proper way to controlled target.

Browse source 
* In creature case ignore fall/etc damage
* In player case apply fall damage/etc to controlled player, apply other movement effect to it also.
This commit is contained in:
VladimirMangos 2009-03-24 14:01:00 +03:00
parent f4482f247f
commit cc11ff40fe
2 changed files with 48 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/game/MovementHandler.cpp
View file

@ -190,6 +190,9 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
if (!MaNGOS::IsValidMapCoord(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o)) if (!MaNGOS::IsValidMapCoord(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o))
return; return;
Unit *mover = _player->m_mover;
Player *plMover = mover->GetTypeId()==TYPEID_PLAYER ? (Player*)mover : NULL;
/* handle special cases */ /* handle special cases */
if (movementInfo.flags & MOVEMENTFLAG_ONTRANSPORT) if (movementInfo.flags & MOVEMENTFLAG_ONTRANSPORT)
{ {
@ -203,24 +206,24 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
return; return;
// if we boarded a transport, add us to it // if we boarded a transport, add us to it
if (!GetPlayer()->m_transport) if (plMover && plMover->m_transport)
{ {
// elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list // elevators also cause the client to send MOVEMENTFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list
for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter) for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
{ {
if ((*iter)->GetGUID() == movementInfo.t_guid) if ((*iter)->GetGUID() == movementInfo.t_guid)
{ {
GetPlayer()->m_transport = (*iter); plMover->m_transport = (*iter);
(*iter)->AddPassenger(GetPlayer()); (*iter)->AddPassenger(plMover);
break; break;
} }
} }
} }
} }
else if (GetPlayer()->m_transport) // if we were on a transport, leave else if (plMover && plMover->m_transport) // if we were on a transport, leave
{ {
GetPlayer()->m_transport->RemovePassenger(GetPlayer()); plMover->m_transport->RemovePassenger(plMover);
GetPlayer()->m_transport = NULL; plMover->m_transport = NULL;
movementInfo.t_x = 0.0f; movementInfo.t_x = 0.0f;
movementInfo.t_y = 0.0f; movementInfo.t_y = 0.0f;
movementInfo.t_z = 0.0f; movementInfo.t_z = 0.0f;
@ -230,57 +233,40 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
} }
// fall damage generation (ignore in flight case that can be triggered also at lags in moment teleportation to another map). // fall damage generation (ignore in flight case that can be triggered also at lags in moment teleportation to another map).
if (opcode == MSG_MOVE_FALL_LAND && !GetPlayer()->isInFlight()) if (opcode == MSG_MOVE_FALL_LAND && plMover && !plMover->isInFlight())
GetPlayer()->HandleFall(movementInfo); plMover->HandleFall(movementInfo);
if(((movementInfo.flags & MOVEMENTFLAG_SWIMMING) != 0) != GetPlayer()->IsInWater()) if (plMover && ((movementInfo.flags & MOVEMENTFLAG_SWIMMING) != 0) != plMover->IsInWater())
{ {
// now client not include swimming flag in case jumping under water // now client not include swimming flag in case jumping under water
GetPlayer()->SetInWater( !GetPlayer()->IsInWater() || GetPlayer()->GetBaseMap()->IsUnderWater(movementInfo.x, movementInfo.y, movementInfo.z) ); plMover->SetInWater( !plMover->IsInWater() || plMover->GetBaseMap()->IsUnderWater(movementInfo.x, movementInfo.y, movementInfo.z) );
} }
/*----------------------*/ /*----------------------*/
/* process position-change */ /* process position-change */
Unit *mover = _player->m_mover;
recv_data.put<uint32>(6, getMSTime()); // fix time, offset flags(4) + unk(2) recv_data.put<uint32>(6, getMSTime()); // fix time, offset flags(4) + unk(2)
WorldPacket data(recv_data.GetOpcode(), (mover->GetPackGUID().size()+recv_data.size())); WorldPacket data(recv_data.GetOpcode(), (mover->GetPackGUID().size()+recv_data.size()));
data.append(mover->GetPackGUID()); // use mover guid data.append(mover->GetPackGUID()); // use mover guid
data.append(recv_data.contents(), recv_data.size()); data.append(recv_data.contents(), recv_data.size());
GetPlayer()->SendMessageToSet(&data, false); GetPlayer()->SendMessageToSet(&data, false);
if(!_player->GetCharmGUID()) // nothing is charmed if(plMover) // nothing is charmed, or player charmed
{ {
_player->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o); plMover->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
_player->m_movementInfo = movementInfo; plMover->m_movementInfo = movementInfo;
_player->SetUnitMovementFlags(movementInfo.flags); plMover->SetUnitMovementFlags(movementInfo.flags);
}
else
{
if(mover->GetTypeId() != TYPEID_PLAYER) // unit, creature, pet, vehicle...
{
if(Map *map = mover->GetMap())
map->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
mover->SetUnitMovementFlags(movementInfo.flags);
}
else // player
{
((Player*)mover)->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
((Player*)mover)->m_movementInfo = movementInfo;
((Player*)mover)->SetUnitMovementFlags(movementInfo.flags);
}
}
GetPlayer()->UpdateFallInformationIfNeed(movementInfo,MSG_MOVE_FALL_LAND); plMover->UpdateFallInformationIfNeed(movementInfo,recv_data.GetOpcode());
if(GetPlayer()->isMovingOrTurning()) if(plMover->isMovingOrTurning())
GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); plMover->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
if(movementInfo.z < -500.0f) if(movementInfo.z < -500.0f)
{ {
if(GetPlayer()->InBattleGround() if(plMover->InBattleGround()
&& GetPlayer()->GetBattleGround() && plMover->GetBattleGround()
&& GetPlayer()->GetBattleGround()->HandlePlayerUnderMap(_player)) && plMover->GetBattleGround()->HandlePlayerUnderMap(_player))
{ {
// do nothing, the handle already did if returned true // do nothing, the handle already did if returned true
} }
@ -289,19 +275,26 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
// NOTE: this is actually called many times while falling // NOTE: this is actually called many times while falling
// even after the player has been teleported away // even after the player has been teleported away
// TODO: discard movement packets after the player is rooted // TODO: discard movement packets after the player is rooted
if(GetPlayer()->isAlive()) if(plMover->isAlive())
{ {
GetPlayer()->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth()); plMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth());
// change the death state to CORPSE to prevent the death timer from // change the death state to CORPSE to prevent the death timer from
// starting in the next player update // starting in the next player update
GetPlayer()->KillPlayer(); plMover->KillPlayer();
GetPlayer()->BuildPlayerRepop(); plMover->BuildPlayerRepop();
} }
// cancel the death timer here if started // cancel the death timer here if started
GetPlayer()->RepopAtGraveyard(); plMover->RepopAtGraveyard();
} }
} }
}
else // creature charmed
{
if(Map *map = mover->GetMap())
map->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
mover->SetUnitMovementFlags(movementInfo.flags);
}
} }
void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data) void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7532" #define REVISION_NR "7533"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__