From 153818e24eaa5eb6b814d768f09e80846d7955d6 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Wed, 22 Jul 2015 01:30:23 +0200 Subject: [PATCH] Fix merge --- src/server/game/Entities/Player/Player.cpp | 29 +++++++-------- src/server/game/Server/Protocol/Opcodes.h | 2 +- src/server/game/Server/WorldSocket.cpp | 41 +++++++++------------- src/server/game/Server/WorldSocket.h | 4 +-- src/server/game/Spells/SpellInfo.cpp | 13 +++++-- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 93a6b14ad3..ad47953bbc 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1993,10 +1993,8 @@ bool Player::BuildEnumData(PreparedQueryResult result, ByteBuffer* dataBuffer, B Tokenizer equipment(fields[19].GetString(), ' '); uint8 slot = fields[21].GetUInt8(); uint32 playerBytes2 = fields[6].GetUInt32(); - - uint16 atLoginFlags = fields[15].GetUInt16(); - if (!ValidateAppearance(uint8(plrRace), uint8(plrClass), gender, uint8(playerBytes >> 16), uint8(playerBytes >> 24), uint8(playerBytes >> 8), uint8(playerBytes2), uint8(playerBytes))) + if (!ValidateAppearance(uint8(plrRace), uint8(plrClass), gender, hairStyle, hairColor, face, facialHair, skin)) { TC_LOG_ERROR("entities.player.loading", "Player %u has wrong Appearance values (Hair/Skin/Color), forcing recustomize", guid); @@ -16460,21 +16458,24 @@ void Player::AreaExploredOrEventHappens(uint32 questId) { if (questId) { - uint16 log_slot = FindQuestSlot(questId); - if (log_slot < MAX_QUEST_LOG_SIZE) + if (Quest const* qInfo = sObjectMgr->GetQuestTemplate(questId)) { - QuestStatusData& q_status = m_QuestStatus[questId]; - - if (!q_status.Explored) + uint16 log_slot = FindQuestSlot(questId); + if (log_slot < MAX_QUEST_LOG_SIZE) { - q_status.Explored = true; - m_QuestStatusSave[questId] = QUEST_DEFAULT_SAVE_TYPE; - SetQuestSlotState(log_slot, QUEST_STATE_COMPLETE); - SendQuestComplete(questId); + QuestStatusData& q_status = m_QuestStatus[questId]; + + if (!q_status.Explored) + { + q_status.Explored = true; + m_QuestStatusSave[questId] = QUEST_DEFAULT_SAVE_TYPE; + SetQuestSlotState(log_slot, QUEST_STATE_COMPLETE); + SendQuestComplete(qInfo); + } } + if (CanCompleteQuest(questId)) + CompleteQuest(questId); } - if (CanCompleteQuest(questId)) - CompleteQuest(questId); } } diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 07e29fcd68..4be2f2155a 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1469,7 +1469,7 @@ extern OpcodeTable opcodeTable; void InitOpcodes(); /// Lookup opcode name for human understandable logging -inline std::string GetOpcodeNameForLogging(Opcodes id) +inline std::string GetOpcodeNameForLogging(uint32 id) { uint32 opcode = uint32(id); std::ostringstream ss; diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 4924a67f4a..4f0ed177e7 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -65,6 +65,8 @@ void WorldSocket::HandleSendAuthSession() packet << uint32(_authSeed); packet << uint8(1); + SendPacketAndLogOpcode(packet); +} void WorldSocket::OnClose() { @@ -147,17 +149,8 @@ bool WorldSocket::ReadHeaderHandler() if (!header->IsValidSize() || (_initialized && !header->IsValidOpcode())) { - if (_worldSession) - { - Player* player = _worldSession->GetPlayer(); - TC_LOG_ERROR("network", "WorldSocket::ReadHeaderHandler(): client (account: %u, char [GUID: %u, name: %s]) sent malformed packet (size: %hu, cmd: %u)", - _worldSession->GetAccountId(), player ? player->GetGUIDLow() : 0, player ? player->GetName().c_str() : "", header->size, header->cmd); - } - else - TC_LOG_ERROR("network", "WorldSocket::ReadHeaderHandler(): client %s sent malformed packet (size: %hu, cmd: %u)", - GetRemoteIpAddress().to_string().c_str(), header->size, header->cmd); - - CloseSocket(); + TC_LOG_ERROR("network", "WorldSocket::ReadHeaderHandler(): client %s sent malformed packet (size: %hu, cmd: %u)", + GetRemoteIpAddress().to_string().c_str(), header->size, header->cmd); return false; } @@ -181,27 +174,27 @@ bool WorldSocket::ReadDataHandler() if (sPacketLog->CanLogPacket()) sPacketLog->LogPacket(packet, CLIENT_TO_SERVER, GetRemoteIpAddress(), GetRemotePort()); - std::unique_lock sessionGuard(_worldSessionLock, std::defer_lock); + std::unique_lock sessionGuard(_worldSessionLock, std::defer_lock); switch (opcode) { case CMSG_PING: - LogOpcodeText(opcode, sessionGuard); - return HandlePing(packet); + LogOpcodeText(opcode, sessionGuard); + return HandlePing(packet); case CMSG_AUTH_SESSION: - LogOpcodeText(opcode, sessionGuard); + LogOpcodeText(opcode, sessionGuard); if (_worldSession) { - // locking just to safely log offending user is probably overkill but we are disconnecting him anyway - if (sessionGuard.try_lock()) - TC_LOG_ERROR("network", "WorldSocket::ProcessIncoming: received duplicate CMSG_AUTH_SESSION from %s", _worldSession->GetPlayerInfo().c_str()); - return false; + // locking just to safely log offending user is probably overkill but we are disconnecting him anyway + if (sessionGuard.try_lock()) + TC_LOG_ERROR("network", "WorldSocket::ProcessIncoming: received duplicate CMSG_AUTH_SESSION from %s", _worldSession->GetPlayerInfo().c_str()); + return false; } HandleAuthSession(packet); break; case CMSG_KEEP_ALIVE: - LogOpcodeText(opcode, sessionGuard); + LogOpcodeText(opcode, sessionGuard); sScriptMgr->OnPacketReceive(_worldSession, packet); break; case CMSG_LOG_DISCONNECT: @@ -219,8 +212,8 @@ bool WorldSocket::ReadDataHandler() } default: { - sessionGuard.lock(); - LogOpcodeText(opcode, sessionGuard); + sessionGuard.lock(); + LogOpcodeText(opcode, sessionGuard); if (!_worldSession) { TC_LOG_ERROR("network.opcode", "ProcessIncoming: Client not authed opcode = %u", uint32(opcode)); @@ -283,13 +276,13 @@ void WorldSocket::LogOpcodeText(uint16 opcode, std::unique_lock cons } } -void WorldSocket::SendPacketAndLogOpcode(WorldPacket const& packet) +void WorldSocket::SendPacketAndLogOpcode(WorldPacket& packet) { TC_LOG_TRACE("network.opcode", "S->C: %s %s", GetRemoteIpAddress().to_string().c_str(), GetOpcodeNameForLogging(packet.GetOpcode()).c_str()); SendPacket(packet); } -void WorldSocket::SendPacket(WorldPacket const& packet) +void WorldSocket::SendPacket(WorldPacket& packet) { if (!IsOpen()) return; diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index f310ec324f..2e8ad37fb4 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -59,7 +59,7 @@ public: void Start() override; - void SendPacket(WorldPacket const& packet); + void SendPacket(WorldPacket& packet); protected: void OnClose() override; @@ -72,7 +72,7 @@ private: /// accessing WorldSession is not threadsafe, only do it when holding _worldSessionLock void LogOpcodeText(uint16 opcode, std::unique_lock const& guard) const; /// sends and logs network.opcode without accessing WorldSession - void SendPacketAndLogOpcode(WorldPacket const& packet); + void SendPacketAndLogOpcode(WorldPacket& packet); void HandleSendAuthSession(); void HandleAuthSession(WorldPacket& recvPacket); void SendAuthResponseError(uint8 code); diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 34d53402d0..fce889b188 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1647,8 +1647,16 @@ SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 a { case SPELL_AURA_FLY: { - if (!player->IsKnowHowFlyIn(map_id, zone_id)) - return SPELL_FAILED_INCORRECT_AREA; + if (player) + { + SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(Id); + for (SkillLineAbilityMap::const_iterator skillIter = bounds.first; skillIter != bounds.second; ++skillIter) + { + // spell 54197 (Cold Weather Flying) is a prereq for flying in Northrend + if (skillIter->second->skillId == SKILL_MOUNTS && player->GetMapId() != 571 && !player->HasSpell(54197)) + return SPELL_FAILED_INCORRECT_AREA; // maybe: SPELL_CUSTOM_ERROR_CANT_USE_THAT_MOUNT + } + } break; } case SPELL_AURA_MOUNTED: @@ -1657,7 +1665,6 @@ SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 a return SPELL_FAILED_NOT_HERE; break; } - } } } }