mirror of
https://github.com/tbamud/tbamud.git
synced 2025-12-23 18:50:13 +01:00
Fixed NOKILL bug I created by a missing { --Rumble
This commit is contained in:
parent
1779f7a30a
commit
6d80a8a12b
2 changed files with 3 additions and 2 deletions
|
|
@ -683,9 +683,10 @@ int damage(struct char_data *ch, struct char_data *victim, int dam, int attackty
|
|||
}
|
||||
|
||||
/* shopkeeper and MOB_NOKILL protection */
|
||||
if (!ok_damage_shopkeeper(ch, victim) || MOB_FLAGGED(victim, MOB_NOKILL))
|
||||
if (!ok_damage_shopkeeper(ch, victim) || MOB_FLAGGED(victim, MOB_NOKILL)) {
|
||||
send_to_char(ch, "This mob is protected.\r\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* You can't damage an immortal! */
|
||||
if (!IS_NPC(victim) && ((GET_LEVEL(victim) >= LVL_IMMORT) && PRF_FLAGGED(victim, PRF_NOHASSLE)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue