summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrojal <trojal@gmail.com>2018-05-31 13:02:01 -0700
committerGitHub <noreply@github.com>2018-05-31 13:02:01 -0700
commitf681c7f6fcbdd167120569d1bfcd8f1b8e74d8da (patch)
tree701466e2f831a555b9b2091e815bceb745fabf8c
parent5c9056c183421df41b546dc3031d251ee6c963b5 (diff)
downloadhercules-f681c7f6fcbdd167120569d1bfcd8f1b8e74d8da.tar.gz
hercules-f681c7f6fcbdd167120569d1bfcd8f1b8e74d8da.tar.bz2
hercules-f681c7f6fcbdd167120569d1bfcd8f1b8e74d8da.tar.xz
hercules-f681c7f6fcbdd167120569d1bfcd8f1b8e74d8da.zip
Don't overwrite mob.range with Inherit:true
Using mob_db2 and Inherit: true shouldn't override the base mob's range if it's not included.
-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 c0bf7946d..a194d8ef1 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;
}