From 61016983c4eb29dc4a76050fa8920c6bcdc0a1fd Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 13 Nov 2018 18:27:06 +0100 Subject: Fixed code that assumed the character to be already on a map, on login Signed-off-by: Haru --- src/map/pc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 282eb7112..9fa97a729 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5839,8 +5839,11 @@ static int pc_setpos(struct map_session_data *sd, unsigned short map_index, int vending->close(sd); } - if (map->list[sd->bl.m].channel) { - channel->leave(map->list[sd->bl.m].channel,sd); + if (sd->mapindex != 0) { + // Only if the character is already on a map + if (map->list[sd->bl.m].channel) { + channel->leave(map->list[sd->bl.m].channel,sd); + } } } -- cgit v1.2.3-60-g2f50