From f5d202fda5e2eb3160c892c0ae3eb2572a7f5a78 Mon Sep 17 00:00:00 2001
From: wyld-sw <wyld@fuzzball.org>
Date: Sun, 31 Dec 2023 08:15:39 -0500
Subject: [PATCH] Move guest-check inside do_set, and allow general wizards to
 un-guest.

---
 src/game.c | 1 -
 src/set.c  | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/game.c b/src/game.c
index c8e9183f..03caaa15 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1393,7 +1393,6 @@ process_command(int descr, dbref player, const char *command)
                             case 'e':
                             case 'E':
                                 Matched("@set");
-                                NOGUEST("@set", player);
                                 do_set(descr, player, arg1, arg2);
                                 break;
 
diff --git a/src/set.c b/src/set.c
index 95ba6bd8..4240af7e 100644
--- a/src/set.c
+++ b/src/set.c
@@ -787,6 +787,13 @@ do_set(int descr, dbref player, const char *name, const char *flag)
         return;
     }
 
+
+    if (ISGUEST(player) &&
+           (!Wizard(player) || *flag != NOT_TOKEN || !string_prefix("GUEST", p))) {
+        notifyf_nolisten(player, "Guests are not allowed to @set.");
+        return;
+    }
+
     /* identify flag */
 
     /*