fix !swap when the player you are replacing already disconnected
This commit is contained in:
parent
2a35212ca4
commit
e4c53906fb
@ -3143,10 +3143,7 @@ def fgoat(cli, nick, chan, rest):
|
|||||||
def rename_player(cli, prefix, nick):
|
def rename_player(cli, prefix, nick):
|
||||||
chan = botconfig.CHANNEL
|
chan = botconfig.CHANNEL
|
||||||
|
|
||||||
if prefix == var.ADMIN_TO_PING:
|
if prefix in var.list_players():
|
||||||
var.ADMIN_TO_PING = nick
|
|
||||||
|
|
||||||
if prefix in var.list_players() and prefix not in var.DISCONNECTED.keys():
|
|
||||||
r = var.ROLES[var.get_role(prefix)]
|
r = var.ROLES[var.get_role(prefix)]
|
||||||
r.add(nick)
|
r.add(nick)
|
||||||
r.remove(prefix)
|
r.remove(prefix)
|
||||||
@ -3162,6 +3159,9 @@ def rename_player(cli, prefix, nick):
|
|||||||
if prefix in v:
|
if prefix in v:
|
||||||
var.ORIGINAL_ROLES[k].remove(prefix)
|
var.ORIGINAL_ROLES[k].remove(prefix)
|
||||||
var.ORIGINAL_ROLES[k].add(nick)
|
var.ORIGINAL_ROLES[k].add(nick)
|
||||||
|
if "(dced)"+prefix in v:
|
||||||
|
var.ORIGINAL_ROLES[k].remove("(dced)"+prefix)
|
||||||
|
var.ORIGINAL_ROLES[k].add(nick)
|
||||||
for k,v in list(var.PLAYERS.items()):
|
for k,v in list(var.PLAYERS.items()):
|
||||||
if prefix == k:
|
if prefix == k:
|
||||||
var.PLAYERS[nick] = var.PLAYERS.pop(k)
|
var.PLAYERS[nick] = var.PLAYERS.pop(k)
|
||||||
@ -3388,7 +3388,11 @@ def on_nick(cli, oldnick, nick):
|
|||||||
if not var.USERS[nick]["inchan"]:
|
if not var.USERS[nick]["inchan"]:
|
||||||
return
|
return
|
||||||
|
|
||||||
rename_player(cli, prefix, nick)
|
if prefix == var.ADMIN_TO_PING:
|
||||||
|
var.ADMIN_TO_PING = nick
|
||||||
|
|
||||||
|
if prefix not in var.DISCONNECTED.keys():
|
||||||
|
rename_player(cli, prefix, nick)
|
||||||
|
|
||||||
def leave(cli, what, nick, why=""):
|
def leave(cli, what, nick, why=""):
|
||||||
nick, _, _, cloak = parse_nick(nick)
|
nick, _, _, cloak = parse_nick(nick)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user