Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-09-22 05:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed NOKILL bug I created by a missing { --Rumble

Browse source
This commit is contained in:
Rumble 2009-12-26 04:57:41 +00:00
parent 1779f7a30a
commit 6d80a8a12b
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/fight.c
View file

@ -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)))

2
src/spell_parser.c
View file

@ -212,7 +212,7 @@ int call_magic(struct char_data *caster, struct char_data *cvict,
act("White light from no particular source suddenly fills the room, then vanishes.", FALSE, caster, 0, 0, TO_ROOM);
return (0);
}
if (MOB_FLAGGED(cvict, MOB_NOKILL)) {
if (cvict && MOB_FLAGGED(cvict, MOB_NOKILL)) {
send_to_char(caster, "This mob is protected.\r\n");
return (0);
}