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

Fix puppet me bug. Resolve #3023

Browse source
This commit is contained in:
Griatch 2022-12-10 00:12:22 +01:00
parent fbb562212c
commit b637afa8cf
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
evennia/commands/default/account.py
View file

@ -22,7 +22,6 @@ import time
from codecs import lookup as codecs_lookup from codecs import lookup as codecs_lookup
from django.conf import settings from django.conf import settings
from evennia.server.sessionhandler import SESSIONS from evennia.server.sessionhandler import SESSIONS
from evennia.utils import create, logger, search, utils from evennia.utils import create, logger, search, utils
@ -191,7 +190,8 @@ class CmdCharCreate(COMMAND_DEFAULT_CLASS):
elif not new_character.db.desc: elif not new_character.db.desc:
new_character.db.desc = "This is a character." new_character.db.desc = "This is a character."
self.msg( self.msg(
f"Created new character {new_character.key}. Use |wic {new_character.key}|n to enter the game as this character." f"Created new character {new_character.key}. Use |wic {new_character.key}|n to enter"
" the game as this character."
) )
logger.log_sec( logger.log_sec(
f"Character Created: {new_character} (Caller: {account}, IP: {self.session.address})." f"Character Created: {new_character} (Caller: {account}, IP: {self.session.address})."
@ -317,11 +317,13 @@ class CmdIC(COMMAND_DEFAULT_CLASS):
if account.db._playable_characters: if account.db._playable_characters:
# look at the playable_characters list first # look at the playable_characters list first
character_candidates.extend( character_candidates.extend(
account.search( utils.make_iter(
self.args, account.search(
candidates=account.db._playable_characters, self.args,
search_object=True, candidates=account.db._playable_characters,
quiet=True, search_object=True,
quiet=True,
)
) )
) )
@ -370,12 +372,14 @@ class CmdIC(COMMAND_DEFAULT_CLASS):
account.puppet_object(session, new_character) account.puppet_object(session, new_character)
account.db._last_puppet = new_character account.db._last_puppet = new_character
logger.log_sec( logger.log_sec(
f"Puppet Success: (Caller: {account}, Target: {new_character}, IP: {self.session.address})." f"Puppet Success: (Caller: {account}, Target: {new_character}, IP:"
f" {self.session.address})."
) )
except RuntimeError as exc: except RuntimeError as exc:
self.msg(f"|rYou cannot become |C{new_character.name}|n: {exc}") self.msg(f"|rYou cannot become |C{new_character.name}|n: {exc}")
logger.log_sec( logger.log_sec(
f"Puppet Failed: %s (Caller: {account}, Target: {new_character}, IP: {self.session.address})." f"Puppet Failed: %s (Caller: {account}, Target: {new_character}, IP:"
f" {self.session.address})."
) )
@ -670,7 +674,8 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
else: else:
flags[new_name] = new_val flags[new_name] = new_val
self.msg( self.msg(
f"Option |w{new_name}|n was changed from '|w{old_val}|n' to '|w{new_val}|n'." f"Option |w{new_name}|n was changed from '|w{old_val}|n' to"
f" '|w{new_val}|n'."
) )
return {new_name: new_val} return {new_name: new_val}
except Exception as err: except Exception as err: