summaryrefslogtreecommitdiff
path: root/src/char/char.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-08-05 15:59:08 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-08-05 15:59:08 -0700
commit738e72ef3b38eef4e0684d49873714a602df53df (patch)
treeed334326997af1727efa617a612c92e3b60356ae /src/char/char.cpp
parentb52f05cbc64987722a6b55524e375cedd9696ca7 (diff)
parente11badbebd078be3437a06a1fb72a7f01c3afd5c (diff)
downloadtmwa-738e72ef3b38eef4e0684d49873714a602df53df.tar.gz
tmwa-738e72ef3b38eef4e0684d49873714a602df53df.tar.bz2
tmwa-738e72ef3b38eef4e0684d49873714a602df53df.tar.xz
tmwa-738e72ef3b38eef4e0684d49873714a602df53df.zip
Merge tag 'v14.4.19'
Conflicts: CHANGELOG
Diffstat (limited to 'src/char/char.cpp')
-rw-r--r--src/char/char.cpp3
1 files changed, 2 insertions, 1 deletions
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;
}
}