diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2015-02-08 02:51:49 +0100 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-01-25 23:36:24 -0300 |
| commit | 62b62ddd63942090b23f8881f2c6ad93d0a251dc (patch) | |
| tree | 7daffa0192e15a7a87e6a3a71e11a5171a357f22 /src/server/game/Handlers/TradeHandler.cpp | |
| parent | f57132b795a097a2c4c863a8153b0c1be5e008c0 (diff) | |
Core/Packets: updated some contactlist packets
(cherry picked from commit e01bb918875f88ede211fc13ff3908e30249de33)
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Player/SocialMgr.cpp
src/server/game/Entities/Player/SocialMgr.h
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Server/Packets/MiscPackets.cpp
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
Diffstat (limited to 'src/server/game/Handlers/TradeHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/TradeHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 5fba3c787df..dc992ebb537 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -673,7 +673,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - if (pOther->GetSocial()->HasIgnore(GetPlayer()->GetGUID().GetCounter())) + if (pOther->GetSocial()->HasIgnore(GetPlayer()->GetGUID())) { info.Status = TRADE_STATUS_IGNORE_YOU; SendTradeStatus(info); |