diff --git a/src/commands/cmdsethandler.py b/src/commands/cmdsethandler.py index 8acf3a528b..049b668d3a 100644 --- a/src/commands/cmdsethandler.py +++ b/src/commands/cmdsethandler.py @@ -81,7 +81,7 @@ class _ErrorCmdSet(CmdSet): class _EmptyCmdSet(CmdSet): "This cmdset represents an empty cmdset" key = "_EMPTY_CMDSET" - priority = -100 + priority = -101 mergetype = "Union" def import_cmdset(python_path, cmdsetobj, emit_to_obj=None, no_logging=False): diff --git a/src/commands/default/batchprocess.py b/src/commands/default/batchprocess.py index 3db5676bb5..fed75d9a4d 100644 --- a/src/commands/default/batchprocess.py +++ b/src/commands/default/batchprocess.py @@ -814,7 +814,7 @@ class BatchSafeCmdSet(CmdSet): always be available to get out of everything. """ key = "Batch_default" - priority = 104 # override other cmdsets. + priority = 150 # override other cmdsets. def at_cmdset_creation(self): "Init the cmdset" diff --git a/src/commands/default/cmdset_player.py b/src/commands/default/cmdset_player.py index 52009e4fe8..a5c71e1dbe 100644 --- a/src/commands/default/cmdset_player.py +++ b/src/commands/default/cmdset_player.py @@ -20,7 +20,7 @@ class PlayerCmdSet(CmdSet): """ key = "DefaultPlayer" - priority = -5 + priority = -10 def at_cmdset_creation(self): "Populates the cmdset" diff --git a/src/commands/default/cmdset_session.py b/src/commands/default/cmdset_session.py index cfaa83ffc2..fe33962d94 100644 --- a/src/commands/default/cmdset_session.py +++ b/src/commands/default/cmdset_session.py @@ -9,7 +9,7 @@ class SessionCmdSet(CmdSet): Sets up the unlogged cmdset. """ key = "DefaultSession" - priority = -7 + priority = -20 def at_cmdset_creation(self): "Populate the cmdset" diff --git a/src/comms/channelhandler.py b/src/comms/channelhandler.py index 16b72b2925..b11546ce4d 100644 --- a/src/comms/channelhandler.py +++ b/src/comms/channelhandler.py @@ -149,7 +149,7 @@ class ChannelHandler(object): # create a new cmdset holding all channels chan_cmdset = cmdset.CmdSet() chan_cmdset.key = '_channelset' - chan_cmdset.priority = 10 + chan_cmdset.priority = 120 chan_cmdset.duplicates = True for cmd in [cmd for cmd in self.cached_channel_cmds if cmd.access(source_object, 'send')]: diff --git a/src/objects/objects.py b/src/objects/objects.py index 551fb8d1c5..aa3b343c52 100644 --- a/src/objects/objects.py +++ b/src/objects/objects.py @@ -1013,7 +1013,7 @@ class Exit(Object): # create a cmdset exit_cmdset = cmdset.CmdSet(None) exit_cmdset.key = '_exitset' - exit_cmdset.priority = 9 + exit_cmdset.priority = 101 exit_cmdset.duplicates = True # add command to cmdset exit_cmdset.add(cmd)