summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-06-02 16:11:02 +0200
committerGitHub <noreply@github.com>2018-06-02 16:11:02 +0200
commite6596534654e7ca395c34db5a8d589ebbcaa0a7d (patch)
tree06aa1dda853e53604cf0d530cae94ca283c19500
parentf0130ab335f0eb5fdb163d93cb790ffc3c2ea443 (diff)
parentf681c7f6fcbdd167120569d1bfcd8f1b8e74d8da (diff)
downloadhercules-e6596534654e7ca395c34db5a8d589ebbcaa0a7d.tar.gz
hercules-e6596534654e7ca395c34db5a8d589ebbcaa0a7d.tar.bz2
hercules-e6596534654e7ca395c34db5a8d589ebbcaa0a7d.tar.xz
hercules-e6596534654e7ca395c34db5a8d589ebbcaa0a7d.zip
Merge pull request #2055 from trojal/patch-1
Don't overwrite mob.range with Inherit:true
-rw-r--r--src/map/mob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mob.c b/src/map/mob.c
index 6edbedfb3..6bd7829ba 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -4312,7 +4312,7 @@ int mob_read_db_sub(struct config_setting_t *mobt, int n, const char *source)
if (mob->lookup_const(mobt, "AttackRange", &i32) && i32 >= 0) {
md.status.rhw.range = i32;
- } else {
+ } else if (!inherit) {
md.status.rhw.range = 1;
}