diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 15:59:08 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 15:59:08 -0700 |
| commit | 738e72ef3b38eef4e0684d49873714a602df53df (patch) | |
| tree | ed334326997af1727efa617a612c92e3b60356ae | |
| parent | b52f05cbc64987722a6b55524e375cedd9696ca7 (diff) | |
| parent | e11badbebd078be3437a06a1fb72a7f01c3afd5c (diff) | |
| download | tmwa-738e72ef3b38eef4e0684d49873714a602df53df.tar.gz tmwa-738e72ef3b38eef4e0684d49873714a602df53df.tar.bz2 tmwa-738e72ef3b38eef4e0684d49873714a602df53df.tar.xz tmwa-738e72ef3b38eef4e0684d49873714a602df53df.zip | |
Merge tag 'v14.4.19'
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | src/char/char.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -16,6 +16,8 @@ v14.6.30: - drop gcc 4.6 support - completely remove flex/bison dependency - fix duplication in npctalk +v14.4.19: + - emergency backport of security fix, since v14.7.1 is too buggy v14.4.18: - fix some fatal bugs related to logout in the previous release - fix out-of-bounds in trades exposed in the previous commit diff --git a/src/char/char.cpp b/src/char/char.cpp index 1e31af9..b9cf17b 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -2673,7 +2673,8 @@ void parse_char(Session *s) { if (cd.key.char_id == cid) { - cs = &cd; + if (cd.key.account_id == sd->account_id) + cs = &cd; break; } } |