diff options
| author | panikon <panikon@zoho.com> | 2014-02-19 17:10:57 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-02-19 17:10:57 -0300 |
| commit | c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2 (patch) | |
| tree | 53b779650a2821dc8bf2a9deb00d5a03890449fe /src/map/chrif.c | |
| parent | 58544d7f610261a903b3e843a795efd7571b2d56 (diff) | |
| parent | d0b9510cf0d7a47e53aa341462a1175326dfc09d (diff) | |
| download | hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.tar.gz hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.tar.bz2 hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.tar.xz hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/chrif.c')
| -rw-r--r-- | src/map/chrif.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c index c55b241e6..d6f0e5ef8 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -457,7 +457,6 @@ 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; } } @@ -1206,7 +1205,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(&sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15); + status->change_start(NULL, &sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15); } pc->scdata_received(sd); @@ -1565,7 +1564,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->fd ) + if( !chrif->isconnected() ) return; WFIFOHEAD(chrif->fd, 28); @@ -1587,7 +1586,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->fd ) { + if( !chrif->isconnected() ) { ShowError("MAYDAY! failed to delete status %d from CID:%d/AID:%d\n",type,char_id,account_id); return; } |