diff options
author | panikon <panikon@zoho.com> | 2014-02-19 17:54:20 -0300 |
---|---|---|
committer | panikon <panikon@zoho.com> | 2014-02-19 17:54:20 -0300 |
commit | e6b107b80355201fa958a74860d59a5034bb839d (patch) | |
tree | 3733e209b68dfcc148053aef38f2f69c4f63a35b /src/map/chrif.c | |
parent | c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2 (diff) | |
download | hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.gz hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.bz2 hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.xz hercules-e6b107b80355201fa958a74860d59a5034bb839d.zip |
Revert "Merge branch 'master' of https://github.com/HerculesWS/Hercules"
This reverts commit c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2, reversing
changes made to 58544d7f610261a903b3e843a795efd7571b2d56.
Diffstat (limited to 'src/map/chrif.c')
-rw-r--r-- | src/map/chrif.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index d6f0e5ef8..c55b241e6 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -457,6 +457,7 @@ int chrif_reconnect(DBKey key, DBData *data, va_list ap) { chrif->changemapserver(sd, ip, port); else //too much lag/timeout is the closest explanation for this error. clif->authfail_fd(sd->fd, 3); + break; } } @@ -1205,7 +1206,7 @@ bool chrif_load_scdata(int fd) { for (i = 0; i < count; i++) { data = (struct status_change_data*)RFIFOP(fd,14 + i*sizeof(struct status_change_data)); - status->change_start(NULL, &sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15); + status->change_start(&sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15); } pc->scdata_received(sd); @@ -1564,7 +1565,7 @@ void chrif_send_report(char* buf, int len) { **/ void chrif_save_scdata_single(int account_id, int char_id, short type, struct status_change_entry *sce) { - if( !chrif->isconnected() ) + if( !chrif->fd ) return; WFIFOHEAD(chrif->fd, 28); @@ -1586,7 +1587,7 @@ void chrif_save_scdata_single(int account_id, int char_id, short type, struct st **/ void chrif_del_scdata_single(int account_id, int char_id, short type) { - if( !chrif->isconnected() ) { + if( !chrif->fd ) { ShowError("MAYDAY! failed to delete status %d from CID:%d/AID:%d\n",type,char_id,account_id); return; } |