diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-10-07 14:57:18 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-10-07 14:57:18 +0100 |
| commit | 44c2edee51ba9cec3c481007c5c659b1e2124058 (patch) | |
| tree | 59cbd3539bcb18f0c22a53c31cc9d9672c25ee35 /src/server/game/Handlers/SpellHandler.cpp | |
| parent | f570383fbadf12c02d2a3f323eadf5ca2417c3bd (diff) | |
| parent | 1a89de87c19936b18d45ec783a3244addb996062 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/game/Handlers/SpellHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/SpellHandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 5c8f6c1f720..cd3b4fae75f 100755 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -325,7 +325,8 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket) if (!go->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; - go->AI()->GossipHello(_player); + if (go->AI()->GossipHello(_player)) + return; _player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT, go->GetEntry()); } |