summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorQwertyDragon <me@christophergoodwin.name>2015-11-09 22:24:19 -0500
committerQwertyDragon <me@christophergoodwin.name>2015-11-09 22:24:19 -0500
commit0b448f9417623f4f5093f87ec33e33985197390b (patch)
treec8ce6422276ccd3e12480e56b33e904419e63fc8 /conf
parent786bf2dd1d07a12eded1f668474b4fe72f8986cc (diff)
parentcfa5239a9561c584a8b3c8b7c8c361ea990631e1 (diff)
downloadserverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.gz
serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.bz2
serverdata-0b448f9417623f4f5093f87ec33e33985197390b.tar.xz
serverdata-0b448f9417623f4f5093f87ec33e33985197390b.zip
Merge branch 'master' of gitlab.com:evol/serverdata
Diffstat (limited to 'conf')
-rw-r--r--conf/battle/player.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index cdfcece8..0b39b757 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -51,6 +51,8 @@ basic_skill_check: yes
// Value is also affected by 'invincible_time_inc' mapflag
player_invincible_time: 5000
+fix_warp_hit_delay_abuse: 1
+
// The time interval for HP to restore naturally. (in milliseconds)
natural_healhp_interval: 6000