Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-29 12:07:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix nick deletion by index. Resolves #1099.

Browse source
This commit is contained in:
Griatch 2016-10-17 22:08:38 +02:00
parent cd9c11f6a8
commit 6e3fa4aea2
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/commands/default/general.py
View file

@ -163,9 +163,10 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
_, _, old_nickstring, old_replstring = oldnick.value
else:
# no old nick, see if a number was given
if self.args.isdigit():
arg = self.args.lstrip("#")
if arg.isdigit():
# we are given a index in nicklist
delindex = int(self.args)
delindex = int(arg)
if 0 < delindex <= len(nicklist):
oldnick = nicklist[delindex-1]
_, _, old_nickstring, old_replstring = oldnick.value
@ -176,9 +177,12 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
if "delete" in switches or "del" in switches:
# clear the nick
errstring = ""
string += "\nNick removed: '|w%s|n' -> |w%s|n." % (old_nickstring, old_replstring)
caller.nicks.remove(nickstring, category=nicktype)
if caller.nicks.has(old_nickstring, category=nicktype):
caller.nicks.remove(old_nickstring, category=nicktype)
string += "\nNick removed: '|w%s|n' -> |w%s|n." % (old_nickstring, old_replstring)
else:
errstring += "\nNick '|w%s|n' was not deleted." % old_nickstring
elif replstring:
# creating new nick