summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/npc.c42
-rw-r--r--src/map/pc.c12
2 files changed, 41 insertions, 13 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index ec6f143d1..59d21e7ba 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -598,7 +598,7 @@ int npc_timerevent(int tid,unsigned int tick,int id,int data)
struct npc_timerevent_list *te;
struct timer_event_data *ted = (struct timer_event_data*)data;
struct map_session_data *sd=NULL;
-
+
if( nd==NULL ){
ShowError("npc_timerevent: NPC not found??\n");
return 0;
@@ -743,6 +743,8 @@ int npc_timerevent_stop(struct npc_data *nd)
*/
void npc_timerevent_quit(struct map_session_data *sd) {
struct TimerData *td;
+ struct npc_data* nd;
+ struct timer_event_data *ted;
if (sd->npc_timer_id == -1)
return;
td = get_timer(sd->npc_timer_id);
@@ -750,9 +752,43 @@ void npc_timerevent_quit(struct map_session_data *sd) {
sd->npc_timer_id = -1;
return; //??
}
- delete_timer(sd->npc_timer_id,npc_timerevent);
+ nd = (struct npc_data *)map_id2bl(td->id);
+ ted = (struct timer_event_data*)td->data;
+ delete_timer(sd->npc_timer_id, npc_timerevent);
sd->npc_timer_id = -1;
- ers_free(timer_event_ers, (struct event_timer_data*)td->data);
+ if (nd && nd->bl.type == BL_NPC)
+ { //Execute OnTimerQuit
+ char buf[sizeof(nd->exname)+sizeof("::OnTimerQuit")+1];
+ struct event_data *ev;
+ sprintf(buf,"%s::OnTimerQuit",nd->exname);
+ ev = strdb_get(ev_db,(unsigned char*)buf);
+ if(ev && ev->nd != nd) {
+ ShowWarning("npc_timerevent_quit: Unable to execute \"OnTimerQuit\", two NPCs have the same event name [%s]!\n",buf);
+ ev = NULL;
+ }
+ if (ev) {
+ int old_rid,old_timer;
+ unsigned int old_tick;
+ //Set timer related info.
+ old_rid = nd->u.scr.rid;
+ nd->u.scr.rid = sd->bl.id;
+
+ old_tick = nd->u.scr.timertick;
+ nd->u.scr.timertick=ted->otick;
+
+ old_timer = nd->u.scr.timer;
+ nd->u.scr.timer=ted->time;
+
+ //Execute label
+ run_script(nd->u.scr.script,ev->pos,sd->bl.id,nd->bl.id);
+
+ //Restore previous data.
+ nd->u.scr.rid = old_rid;
+ nd->u.scr.timer = old_timer;
+ nd->u.scr.timertick = old_tick;
+ }
+ }
+ ers_free(timer_event_ers, ted);
}
/*==========================================
diff --git a/src/map/pc.c b/src/map/pc.c
index 558f0f0be..9a929f852 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -573,9 +573,9 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
return 1;
}
- if( (old_sd=map_id2sd(sd->status.account_id)) != NULL ){
+ if( (old_sd=map_id2sd(st->account_id)) != NULL ){
if (old_sd->state.finalsave || !old_sd->state.auth)
- ; //Previous player is not done loading, No need to kick.
+ ; //Previous player is not done loading/quiting, No need to kick.
else if (old_sd->fd)
clif_authfail_fd(old_sd->fd, 2); // same id
else
@@ -583,14 +583,6 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
clif_authfail_fd(sd->fd, 8); // still recognizes last connection
return 1;
}
-
- if (map_id2sd(st->account_id) != NULL)
- { //Somehow a second connection has managed to go through the double-connection
- //check in clif_parse_WantToConnection! [Skotlex]
- clif_authfail_fd(sd->fd, 0);
- return 1;
- }
-
memcpy(&sd->status, st, sizeof(*st));
//Set the map-server used job id. [Skotlex]