diff options
| author | Nay <dnpd.dd@gmail.com> | 2011-11-26 03:19:37 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2011-11-26 03:19:37 +0000 |
| commit | 846870bf6c47fbbdefef39c35ff11159b850082b (patch) | |
| tree | d2a850d832e9242fb5ca1cf22df29f8cab851406 /src/server/scripts/World | |
| parent | 31533a342a56b1db22b50fe9f6c4c24c380cd507 (diff) | |
| parent | c105be95a5b9f42d0d85fc2d3c5563a928321eb4 (diff) | |
Merge branch 'master' into 4.x
Conflicts:
src/server/shared/Database/Implementation/CharacterDatabase.cpp
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index f83b728ee01..3bb969977b6 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1009,7 +1009,7 @@ public: if (qInfo) { //TODO: prisoner should help player for a short period of time - player->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); + player->KilledMonsterCredit(qInfo->RequiredNpcOrGo[0], 0); pPrisoner->DisappearAndDie(); } return true; |