From: Ari Johnson <ari@theari.com>
Date: Thu, 5 Mar 2009 21:30:17 +0000 (+0000)
Subject: Fix another failure to check for GoodObject()
X-Git-Tag: 0.73p1~4
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=8141d0c1ff930e0fd21e1c26504a3ffdc50a0347;p=cobramush.git

Fix another failure to check for GoodObject()
(cherry picked from commit d8a30008749d9ce430562fa4e8805cde89a0bba6)
---

diff --git a/src/game.c b/src/game.c
index fc90a04..d34fb0b 100644
--- a/src/game.c
+++ b/src/game.c
@@ -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