Merge branch 'remove_start_timer'

Closes #230.
This commit is contained in:
nyuszika7h 2016-10-19 21:49:27 +02:00
commit 765acd2300

View File

@ -3063,9 +3063,9 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
var.START_VOTES.discard(nick)
# Cancel the start vote timer if there are no votes left
if len(var.START_VOTES) < 1 and 'start_votes' in var.TIMERS:
var.TIMERS['start_votes'][0].cancel()
del var.TIMERS['start_votes']
if not var.START_VOTES and "start_votes" in var.TIMERS:
var.TIMERS["start_votes"][0].cancel()
del var.TIMERS["start_votes"]
# Died during the joining process as a person
if var.AUTO_TOGGLE_MODES and nick in var.USERS and var.USERS[nick]["moded"]: