From d2a65817313f70414e16999f3b8881f0042cd786 Mon Sep 17 00:00:00 2001 From: Inkfish Date: Sun, 3 May 2009 04:41:04 +0000 Subject: * Players now cannot be revived during pvp respawn delay * Fix a logical problem on my last commit git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13720 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 8bdba2871..d8b1436a0 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -498,7 +498,12 @@ int npc_timerevent_start(struct npc_data* nd, int rid) } //Check if timer is already started. - if( (sd && sd->npc_timer_id != -1) || nd->u.scr.timerid != -1 ) + if( sd ) + { + if( sd->npc_timer_id != -1 ) + return 0; + } + else if( nd->u.scr.timerid != -1 ) return 0; ted = ers_alloc(timer_event_ers, struct timer_event_data); -- cgit v1.2.3-60-g2f50