From: Ari Johnson <ari@cobramush.org>
Date: Tue, 20 Feb 2007 21:28:52 +0000 (+0000)
Subject: FIXED players may no longer teleport through exits
X-Git-Tag: 0.73~170
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=cae78327d81451504b98699e2a0ed23dbd243b9a;p=cobramush.git

FIXED players may no longer teleport through exits
---

diff --git a/src/wiz.c b/src/wiz.c
index f1d2b04..afb1660 100644
--- a/src/wiz.c
+++ b/src/wiz.c
@@ -558,13 +558,17 @@ do_teleport(dbref player, const char *arg1, const char *arg2, int silent,
       return;
     } else {
       /* attempted teleport to an exit */
-      if (Tel_Thing(player, victim) || controls(player, victim)
-	  || controls(player, Location(victim)))
+      if ((Tel_Thing(player, victim) || controls(player, victim)
+	   || controls(player, Location(victim)))
+	  && !Fixed(Owner(victim)) && !Fixed(player)) {
 	do_move(victim, to, 0);
-      else
-	notify_format(victim,
-		      T("%s tries to impose his will on you and fails."),
-		      Name(player));
+      } else {
+	notify(player, T("Permission denied."));
+	if (victim != player)
+	  notify_format(victim,
+			T("%s tries to impose his will on you and fails."),
+			Name(player));
+      }
     }
   }
 }