Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Battlefield/Zones/BattlefieldWG.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/EasternKingdoms/stormwind_city.cpp src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp src/server/scripts/Kalimdor/azshara.cpp
This commit is contained in:
commit
8ae0f2332c
67 files changed
+3559
-1434
No files matched your search
@@ -52,15 +52,8 @@ void WorldSession::HandleClientCastFlags(WorldPacket& recvPacket, uint8 castFlag
|
||||
recvPacket >> hasMovementData;
|
||||
if (hasMovementData)
|
||||
{
|
||||
recvPacket.rfinish();
|
||||
// movement packet for caster of the spell
|
||||
/*recvPacket.read_skip<uint32>(); // MSG_MOVE_STOP - hardcoded in client
|
||||
uint64 guid;
|
||||
recvPacket.readPackGUID(guid);
|
||||
|
||||
MovementInfo movementInfo;
|
||||
movementInfo.guid = guid;
|
||||
ReadMovementInfo(recvPacket, &movementInfo);*/
|
||||
recvPacket.SetOpcode(Opcodes(recvPacket.read<uint32>()));
|
||||
HandleMovementOpcodes(recvPacket);
|
||||
}
|
||||
}
|
||||
else if (castFlags & 0x8) // Archaeology
|
||||
|
||||
Reference in new issue
Block a user