#
# $Id: mini-patch-2.patch,v 1.1 1998/05/16 03:33:40 joi Exp $
# $Log: mini-patch-2.patch,v $
# Revision 1.1  1998/05/16 03:33:40  joi
# Initial revision
#
#
# 05/15/98 J. Ellis (Patch)
# 05/01/98 A. Molitor (Bug Report)
# 05/02/98 J. Baker (Code)
#
# This patch corrects a problem that sometimes occurs when a room
# executes code that ends up doing a master room search for something like
# a global command.  The room attempts to use its own location to look
# up a parent, but rooms don't have locations and Parent() returns
# garbage, or causes the server to dump core.
#
#

*** src/command.c	1995/03/20 23:59:47	1.11
--- src/command.c	1998/05/16 03:26:10	1.11.6.1
***************
*** 1260,1266 ****
  
  	if (!succ) {
  	    parent = Parent(player);
! 	    if ((parent != Location(player)) &&
  		(parent != Parent(Location(player)))) {
  		while (!succ && !got_stop && 
  		       Good_obj(parent) && Zone(parent)) {
--- 1260,1266 ----
  
  	if (!succ) {
  	    parent = Parent(player);
! 	     if ((Good_obj(Location(player))) && (parent != Location(player)) &&
  		(parent != Parent(Location(player)))) {
  		while (!succ && !got_stop && 
  		       Good_obj(parent) && Zone(parent)) {