summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-01-15 16:53:49 -0200
committershennetsind <ind@henn.et>2014-01-15 16:53:49 -0200
commitfac54ab4d7a7eea4f356e1c4836e321a14a789d5 (patch)
treecfbafccea715514295846ce2f150713b25806b29 /src
parentc50e094dff1898badd4136d9cdeb7318c803cb61 (diff)
downloadhercules-fac54ab4d7a7eea4f356e1c4836e321a14a789d5.tar.gz
hercules-fac54ab4d7a7eea4f356e1c4836e321a14a789d5.tar.bz2
hercules-fac54ab4d7a7eea4f356e1c4836e321a14a789d5.tar.xz
hercules-fac54ab4d7a7eea4f356e1c4836e321a14a789d5.zip
Standalone (persistent autotraders) merchants no longer autojoin channels.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 5c2201baf..b51651b90 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9197,6 +9197,8 @@ void clif_parse_WantToConnection(int fd, struct map_session_data* sd) {
chrif->authreq(sd,false);
}
void clif_hercules_chsys_mjoin(struct map_session_data *sd) {
+ if( sd->state.autotrade || sd->state.standalone )
+ return;
if( !map->list[sd->bl.m].channel ) {
if (map->list[sd->bl.m].flag.chsysnolocalaj || (map->list[sd->bl.m].instance_id >= 0 && instance->list[map->list[sd->bl.m].instance_id].owner_type != IOT_NONE) )