diff options
| author | Spp <spp@jorge.gr> | 2012-10-23 14:16:05 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-23 14:16:05 +0200 |
| commit | 60d4343d8e8183e170ec833b43ec1254d5752c80 (patch) | |
| tree | 718b83fa9d886610bb281785d6a19b3ea0d5ba4a /src/server/scripts/Outland/zangarmarsh.cpp | |
| parent | b73a5f32b07c227abc9c03a3348bf6d786107c30 (diff) | |
| parent | 663db1cee3ab9bd3de76f210bc7c178f4991953e (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Spells/Spell.cpp
src/server/shared/Logging/Appender.h
Diffstat (limited to 'src/server/scripts/Outland/zangarmarsh.cpp')
| -rw-r--r-- | src/server/scripts/Outland/zangarmarsh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index aa51b532c27..a48866a2f83 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -249,7 +249,7 @@ public: break; case GOSSIP_ACTION_INFO_DEF + 2: { - if (!player->HasItemCount(24573, 1)) + if (!player->HasItemCount(24573)) { ItemPosCountVec dest; uint32 itemId = 24573; |