From: Ari Johnson <ari@startrekkin.net>
Date: Fri, 15 Feb 2008 19:46:33 +0000 (+0000)
Subject: Fixed regression in attribute lock bugfix
X-Git-Tag: 0.72p4~3
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=9045425b4867208d36238d27ee1ed19786457252;p=cobramush.git

Fixed regression in attribute lock bugfix
(cherry picked from commit d801f6dcb4cec94e8ec6ceec12672563dfc9854e)
---

diff --git a/src/attrib.c b/src/attrib.c
index 42dce70..b5305c2 100644
--- a/src/attrib.c
+++ b/src/attrib.c
@@ -2063,15 +2063,17 @@ can_read_attr_internal(dbref player, dbref obj, ATTR * atr)
 
   /* Take an easy out if there is one... */
   /* If we can't see the attribute itself, then that's easy. */
-  if (AF_Internal(atr)
-      || (!Admin(player)
-          && (AF_Mdark(atr)
-	      || !(cansee
-		   || ((AF_Visual(atr)
-			|| ((AL_RLock(atr) != TRUE_BOOLEXP) && r_lock))
-		       && (!AF_Nearby(atr) || canlook))
+  if (AF_Internal(atr) && !God(player))
+    return 0;
+
+  if(!Admin(player)
+     && (AF_Mdark(atr)
+	 || !(cansee
+	      || ((AF_Visual(atr)
+		   || ((AL_RLock(atr) != TRUE_BOOLEXP) && r_lock))
+		  && (!AF_Nearby(atr) || canlook))
 	      || (!visible && !Mistrust(player)
-		  && (Owner(AL_CREATOR(atr)) == Owner(player)))))))
+		  && (Owner(AL_CREATOR(atr)) == Owner(player))))))
     return 0;
 
   /* If the attribute isn't on a branch, then that's also easy. */