summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-09-09 16:04:18 -0300
committershennetsind <ind@henn.et>2013-09-09 16:04:18 -0300
commit78c14e42231965f281090785170aac5c0c119a9a (patch)
tree10ac1dc5ae17ec6bde7f836a54b9570129e0d668 /src/map
parent0555708604b5609f6827d3eaa820d7e49aabd03a (diff)
downloadhercules-78c14e42231965f281090785170aac5c0c119a9a.tar.gz
hercules-78c14e42231965f281090785170aac5c0c119a9a.tar.bz2
hercules-78c14e42231965f281090785170aac5c0c119a9a.tar.xz
hercules-78c14e42231965f281090785170aac5c0c119a9a.zip
Fixed Bug #7343
Fixed GvG/PvP warp-on-death thing to not have a 1-second delay and be instantaneous, and not display the respawn window whenever applicable. Special Thanks to kyeme. http://hercules.ws/board/tracker/issue-7343-gvg-warp-back-delay-when-died/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/pc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 7607db560..917e5c4ce 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7027,14 +7027,14 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) {
}
if( sd->pvp_point < 0 )
{
- iTimer->add_timer(tick+1000, pc_respawn_timer,sd->bl.id,0);
+ iTimer->add_timer(tick+1, pc_respawn_timer,sd->bl.id,0);
return 1|8;
}
}
//GvG
if( map_flag_gvg(sd->bl.m) )
{
- iTimer->add_timer(tick+1000, pc_respawn_timer, sd->bl.id, 0);
+ iTimer->add_timer(tick+1, pc_respawn_timer, sd->bl.id, 0);
return 1|8;
}
else if( sd->bg_id )