notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check if var.AFTER_FLASTGAME is not None instead of truthy or callable

Browse Source 
If someone sets it to something other than a function (well, callable
object) or None, it's a programming mistake and we want that to raise an
exception rather than be silently ignored.
This commit is contained in:
nyuszika7h 2015-05-24 23:14:43 +02:00
parent 0c7d5a8a53
commit e046358a62
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wolfgame.py
View File

@ -1377,7 +1377,7 @@ def kill_join(cli, chan):
cli.msg(chan, 'The current game took too long to start and ' +
'has been canceled. If you are still active, ' +
'please join again to start a new game.')
if callable(var.AFTER_FLASTGAME):
if var.AFTER_FLASTGAME is not None:
var.AFTER_FLASTGAME()
var.AFTER_FLASTGAME = None
@ -2186,7 +2186,7 @@ def stop_game(cli, winner = "", abort = False):
reset()
# This must be after reset()
if var.AFTER_FLASTGAME:
if var.AFTER_FLASTGAME is not None:
var.AFTER_FLASTGAME()
var.AFTER_FLASTGAME = None
if var.ADMIN_TO_PING: # It was an flastgame
@ -2207,7 +2207,7 @@ def chk_win(cli, end_game = True):
reset()
# This must be after reset()
if var.AFTER_FLASTGAME:
if var.AFTER_FLASTGAME is not None:
var.AFTER_FLASTGAME()
var.AFTER_FLASTGAME = None
if var.ADMIN_TO_PING: # It was an flastgame