diff options
| author | kandera <kanderadev@gmail.com> | 2012-10-05 06:04:24 -0700 |
|---|---|---|
| committer | kandera <kanderadev@gmail.com> | 2012-10-05 06:04:24 -0700 |
| commit | 42c047bebc09d5a9da48052bf4e9e341dae5f04c (patch) | |
| tree | cef252a356a9cf877a21cbf8ae32830dcc241d3b /src/server/game/Entities/GameObject | |
| parent | c4c093ac80140647f06dfc5ece73612c47363d45 (diff) | |
| parent | a2c9c4098a6f6e41b26ee19aa834fb813f1f94a3 (diff) | |
Merge pull request #7839 from Warpten/soulwell
Core/Spells: Fixed Soulwell charges removal on use.
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index c4d42f7a537..bd5b544c33c 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1080,7 +1080,8 @@ void GameObject::Use(Unit* user) if (sScriptMgr->OnGossipHello(playerUser, this)) return; - AI()->GossipHello(playerUser); + if (AI()->GossipHello(playerUser)) + return; } // If cooldown data present in template |