--- deliantra/server/server/attack.C 2008/09/29 11:52:34 1.97 +++ deliantra/server/server/attack.C 2008/09/29 11:59:55 1.98 @@ -951,10 +951,15 @@ */ if (victim->x != hitter->x || victim->y != hitter->y) { - hitter->remove (); - hitter->x = victim->x; - hitter->y = victim->y; - insert_ob_in_map (hitter, victim->map, hitter, 0); + if (victim->destroyed ()) + hitter->destroy (); + else + { + hitter->remove (); + hitter->x = victim->x; + hitter->y = victim->y; + insert_ob_in_map (hitter, victim->map, hitter, 0); + } } else /* Else leave arrow where it is */