From 1983582d259875b95b1ec55ac342d102c936c026 Mon Sep 17 00:00:00 2001 From: Freeyorp Date: Mon, 5 Apr 2010 22:39:03 +1200 Subject: Make injure() respect killer and killable states --- src/map/magic-stmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/magic-stmt.c b/src/map/magic-stmt.c index 93ef65f..a318314 100644 --- a/src/map/magic-stmt.c +++ b/src/map/magic-stmt.c @@ -714,7 +714,7 @@ static int op_injure (env_t * env, int args_nr, val_t * args) int target_hp = battle_get_hp (target); int mdef = battle_get_mdef (target); - if (target->type == BL_PC && !map[target->m].flag.pvp) + if (target->type == BL_PC && !map[target->m].flag.pvp && !((character_t *) target)->special_state.killable && (caster->type != BL_PC || !((character_t *) caster)->special_state.killer)) return 0; /* Cannot damage other players outside of pvp */ if (target != caster) -- cgit v1.2.3-60-g2f50