*** old-command.c Mon May 25 13:34:48 1998 --- command.c Mon May 25 13:34:54 1998 *************** *** 1291,1297 **** if (!succ) { parent = Parent(player); if ((parent != Location(player)) && ! (parent != Parent(Location(player)))) { while (!succ && !got_stop && Good_obj(parent) && Zone(parent)) { if (Has_contents(parent)) { --- 1291,1298 ---- if (!succ) { parent = Parent(player); if ((parent != Location(player)) && ! (!Good_obj(Location(player)) || ! (parent != Parent(Location(player))))) { while (!succ && !got_stop && Good_obj(parent) && Zone(parent)) { if (Has_contents(parent)) {