diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-03 04:41:04 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-03 04:41:04 +0000 |
| commit | d2a65817313f70414e16999f3b8881f0042cd786 (patch) | |
| tree | f0b3da4925525c8766bfc6d5d7e30c3df71992c3 | |
| parent | 2875015cd6264e6e65f39bd805eef0f913eaebac (diff) | |
| download | hercules-d2a65817313f70414e16999f3b8881f0042cd786.tar.gz hercules-d2a65817313f70414e16999f3b8881f0042cd786.tar.bz2 hercules-d2a65817313f70414e16999f3b8881f0042cd786.tar.xz hercules-d2a65817313f70414e16999f3b8881f0042cd786.zip | |
* 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
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/npc.c | 7 | ||||
| -rw-r--r-- | src/map/pc.c | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f18f3693b..e2fbb9320 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -7,6 +7,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. * Do not log damage if it's done by mob itself (bugreport:2933) [Inkfish] * Fix 'awake' not working (bugreport:2580) [Inkfish] * Fix several npctimer issues (bugreport:1619, bugreport:1730) [Inkfish] + * Players now cannot be revived during pvp respawn delay [Inkfish] 2009/05/02 * Spirit of Bard and Dancer now only works for mastered skills (bugreport:3037) [Playtester] - also fixed an outdated comment in the source code 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); diff --git a/src/map/pc.c b/src/map/pc.c index 1c4330c01..e831f69cb 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -436,7 +436,7 @@ int pc_makesavestatus(struct map_session_data *sd) } /*========================================== - * 接?暫ﾌ初期化 + * 接?暫ﾌ初期? *------------------------------------------*/ int pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int login_id1, unsigned int client_tick, int sex, int fd) { @@ -5548,7 +5548,6 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) } if( sd->pvp_point < 0 ) { - sd->pvp_point=0; add_timer(tick+1000, pc_respawn_timer,sd->bl.id,0); return 1|8; } |