diff --git a/contrib/tutorial_world/objects.py b/contrib/tutorial_world/objects.py index 6c48b6d6d0..3ecbee76ac 100644 --- a/contrib/tutorial_world/objects.py +++ b/contrib/tutorial_world/objects.py @@ -288,7 +288,6 @@ class CmdLightSourceOn(Command): # look around self.caller.execute_cmd("look") - class CmdLightSourceOff(Command): """ Switch off the lightsource. diff --git a/src/commands/cmdhandler.py b/src/commands/cmdhandler.py index dc45408836..f182f5e5ad 100644 --- a/src/commands/cmdhandler.py +++ b/src/commands/cmdhandler.py @@ -122,6 +122,8 @@ def get_and_merge_cmdsets(caller): yield obj.at_cmdset_get() except Exception: logger.log_trace() + # the call-type lock is checked here, it makes sure a player is not seeing e.g. the commands + # on a fellow player (which is why the no_superuser_bypass must be True) local_objects_cmdsets = yield [obj.cmdset.current for obj in local_objlist if (obj.cmdset.current and obj.locks.check(caller, 'call', no_superuser_bypass=True))] for cset in local_objects_cmdsets: diff --git a/src/objects/objects.py b/src/objects/objects.py index 8ae03b32fc..cd589db688 100644 --- a/src/objects/objects.py +++ b/src/objects/objects.py @@ -774,8 +774,6 @@ class Character(Object): "call:false()"])) # no commands can be called on character from outside # add the default cmdset self.cmdset.add_default(settings.CMDSET_DEFAULT, permanent=True) - # no other character should be able to call commands on the Character. - self.cmdset.outside_access = False def at_object_creation(self): """ diff --git a/src/players/player.py b/src/players/player.py index f399b6714f..d10c330912 100644 --- a/src/players/player.py +++ b/src/players/player.py @@ -232,7 +232,6 @@ class Player(TypeClass): # The ooc player cmdset self.cmdset.add_default(CMDSET_OOC, permanent=True) - self.cmdset.outside_access = False def at_player_creation(self): """