Merge branch 'irc' of git@github.com:greghaynes/xsbs into irc

greghaynes · Mar 21, 2010 · ffbe201 · ffbe201
2 parents 8c5d50c + fdfbf9c
commit ffbe201
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/pyscripts/plugins/ircbot.py b/src/pyscripts/plugins/ircbot.py
@@ -5,7 +5,7 @@
 from xsbs.settings import loadPluginConfig, NoOptionError
 from xsbs.events import registerServerEventHandler
 from xsbs.timers import addTimer
-from xsbs.server import message
+from xsbs.server import message, masterModeName
 
 import sbserver
 
@@ -168,7 +168,7 @@ def dotemplate(ability, **args):
 	'spectated': ('player_spectated', lambda cn: dotemplate('spectated', name=sbserver.playerName(cn), cn=cn)),
 	'unspectated': ('player_unspectated', lambda cn: dotemplate('unspectated', name=sbserver.playerName(cn), cn=cn)),
 	'kicked': ('player_kick', lambda cn, who: dotemplate('kicked', by=sbserver.playerName(cn), bycn=cn, name=sbserver.playerName(who), cn=who)),
-	'mastermode_changed': ('server_mastermode_changed', lambda mm: dotemplate('mastermode_changed', mm=mm, mode=sbserver.modeName(mm))),
+	'mastermode_changed': ('server_mastermode_changed', lambda mm: dotemplate('mastermode_changed', mm=mm, mode=masterModeName(mm))),
 	'clearbans': ('server_clear_bans', lambda cn: dotemplate('clearbans', name=sbserver.playerName(cn), cn=cn))
 }