Fix another failure to check for GoodObject()
authorAri Johnson <ari@theari.com>
Thu, 5 Mar 2009 21:30:17 +0000 (21:30 +0000)
committerAri Johnson <ari@theari.com>
Thu, 5 Mar 2009 21:30:17 +0000 (21:30 +0000)
src/game.c

index fc90a04ddaa51421cc112cb4b71d928d3a58537e..d34fb0b2cb357f2a07fbadc0fa98af1d071420b4 100644 (file)
@@ -1279,8 +1279,8 @@ process_command(dbref player, char *command, dbref cause, dbref realcause,  int
       /* if nothing matched with zone master room/zone object, try
        * matching zone commands on the player's personal zone
        */
-      if ((!a) && (Zone(player) != NOTHING) &&
-         (Zone(Location(check_loc)) != Zone(player))) {
+      if ((!a) && (Zone(player) != NOTHING) && GoodObject(Location(check_loc))
+         && (Zone(Location(check_loc)) != Zone(player))) {
        if (IsRoom(Zone(player)))
          /* Player's personal zone is a zone master room, so we
           * also check commands on objects in that room