Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed OOC display regression for non-superusers in MULTISESSION_MODEs 2,3. Also made the ic command able to correctly handle trying to puppet one of multiple same-named objects.

Browse source
This commit is contained in:
Griatch 2016-08-06 20:52:01 +02:00
parent a740099d3f
commit 92f610470b
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
evennia/commands/default/player.py
View file

@ -216,12 +216,15 @@ class CmdIC(COMMAND_DEFAULT_CLASS):
return return
if not new_character: if not new_character:
# search for a matching character # search for a matching character
new_character = search.object_search(self.args) new_character = [char for char in search.object_search(self.args) if char.access(player, "puppet")]
if new_character: if not new_character:
new_character = new_character[0]
else:
self.msg("That is not a valid character choice.") self.msg("That is not a valid character choice.")
return return
if len(new_character) > 1:
self.msg("Multiple characters with the same name:\n %s" % ", ".join(new_character))
return
else:
new_character = new_character[0]
try: try:
player.puppet_object(session, new_character) player.puppet_object(session, new_character)
player.db._last_puppet = new_character player.db._last_puppet = new_character

4
evennia/players/players.py
View file

@ -815,11 +815,9 @@ class DefaultPlayer(with_metaclass(TypeclassBase, PlayerDB)):
if target and not is_iter(target): if target and not is_iter(target):
# single target - just show it # single target - just show it
return target.return_appearance(self) return target.return_appearance(self)
elif not target:
return "|rNo such character.|n"
else: else:
# list of targets - make list to disconnect from db # list of targets - make list to disconnect from db
characters = list(target) characters = list(target) if target else []
sessions = self.sessions.all() sessions = self.sessions.all()
is_su = self.is_superuser is_su = self.is_superuser