diff options
| author | leak <leakzx@googlemail.com> | 2011-01-26 01:03:35 +0100 |
|---|---|---|
| committer | leak <leakzx@googlemail.com> | 2011-01-26 01:03:35 +0100 |
| commit | 137b079eea2c8bff3bfa33099c016502beeb868a (patch) | |
| tree | 876ce4404a299c6ed7cccf79fc04d8ad4b29b385 /src/server/game/Server | |
| parent | 57f85ab7da3c1759a0cef3bd0497253c54bf1218 (diff) | |
Core: Generic cleanup (tab2spaces/trailing whitespace removal)
Diffstat (limited to 'src/server/game/Server')
5 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp index f7f546220ea..b81efc01bbd 100755 --- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp @@ -838,7 +838,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recv_data) uint64 Guid; recv_data >> Guid; - Player *player = HashMapHolder<Player>::Find(Guid); + Player *player = HashMapHolder<Player>::Find(Guid); if (!player) { WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2); diff --git a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp index 4f9c081a5d8..2ac129973a9 100755 --- a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp @@ -126,7 +126,7 @@ void WorldSession::HandleLfgSetCommentOpcode(WorldPacket& recv_data) recv_data >> comment; uint64 guid = GetPlayer()->GetGUID(); sLog->outDebug("CMSG_SET_LFG_COMMENT [" UI64FMTD "] comment: %s", guid, comment.c_str()); - + sLFGMgr->SetComment(guid, comment); } @@ -256,7 +256,7 @@ void WorldSession::HandleLfgPartyLockInfoRequestOpcode(WorldPacket& /*recv_data uint32 size = 0; for (LfgLockPartyMap::const_iterator it = lockMap.begin(); it != lockMap.end(); ++it) size += 8 + 4 + uint32(it->second.size()) * (4 + 4); - + sLog->outDebug("SMSG_LFG_PARTY_INFO [" UI64FMTD "]", guid); WorldPacket data(SMSG_LFG_PARTY_INFO, 1 + size); BuildPartyLockDungeonBlock(data, lockMap); diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp index 4c0c8f1fb2f..1090f3c064b 100755 --- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp @@ -707,7 +707,7 @@ void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data) if (seat->CanEnterOrExit()) GetPlayer()->ExitVehicle(); else - sLog->outError("Player %u tried to exit vehicle, but seatflags %u (ID: %u) don't permit that.", + sLog->outError("Player %u tried to exit vehicle, but seatflags %u (ID: %u) don't permit that.", GetPlayer()->GetGUIDLow(), seat->m_ID, seat->m_flags); } } diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp index 051cb122074..4eb37efdd23 100755 --- a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp @@ -127,7 +127,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data) Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER); // no or incorrect quest giver - if (!pObject || (pObject->GetTypeId() != TYPEID_PLAYER && !pObject->hasQuest(quest)) || + if (!pObject || (pObject->GetTypeId() != TYPEID_PLAYER && !pObject->hasQuest(quest)) || (pObject->GetTypeId() == TYPEID_PLAYER && !pObject->ToPlayer()->CanShareQuest(quest))) { _player->PlayerTalkClass->CloseGossip(); diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index a5ad60fc5ba..7a0e3a6b51c 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -959,7 +959,7 @@ void WorldSession::ProcessQueryCallbacks() if (m_nameQueryCallbacks.next_readable(lResult, &timeout) != 1) break; - if (lResult.ready()) + if (lResult.ready()) { lResult.get(result); SendNameQueryOpcodeFromDBCallBack(result); |
