Fix mummy death curses

Oops x237
Floodkiller · Apr 2, 2019 · 1db982d · 1db982d
1 parent 731b41b
commit 1db982d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/crawl-ref/source/spl-goditem.cc b/crawl-ref/source/spl-goditem.cc
@@ -1165,7 +1165,7 @@ void torment_cell(coord_def where, actor *attacker, torment_source_type taux)
     // Is the player in this cell? Sceptre of Torment doesn't affect the
     // wielder
     if (where == you.pos()
-        && (!attacker->is_player() || taux != TORMENT_SCEPTRE))
+        && !(attacker && attacker->is_player() || taux == TORMENT_SCEPTRE))
         torment_player(attacker, taux);
     // Don't return, since you could be standing on a monster.
 
@@ -1174,7 +1174,9 @@ void torment_cell(coord_def where, actor *attacker, torment_source_type taux)
     if (!mons
         || !mons->alive()
         || mons->res_torment()
-        || mons == attacker->as_monster() && taux == TORMENT_SCEPTRE)
+        || attacker
+           && mons == attacker->as_monster()
+           && taux == TORMENT_SCEPTRE)
         return;
 
     int hploss = max(0, mons->hit_points * (50 - mons->res_negative_energy() * 5) / 100 - 1);