Fixed problem with announcer, removed unused args.

Author: 8r2y5

plugins/announcer_plugin/announcer_plugin.py

@@ -14,19 +14,15 @@ def after_connect_success(self, data):
         self.factory.broadcast(
             '{} logged in.'.format(
                 self.protocol.player.colored_name(self.config.colors),
-                0,
-                'Announcer'
-            )
+            ),
+            'Announcer'
         )
 
     def on_client_disconnect_request(self, data):
         if self.protocol.player is not None:
             self.factory.broadcast(
-                self.factory.broadcast(
-                    '{} logged out.'.format(
-                        self.protocol.player.colored_name(self.config.colors),
-                        0,
-                        'Announcer'
-                    )
-                )
+                '{} logged out.'.format(
+                    self.protocol.player.colored_name(self.config.colors),
+                ),
+                'Announcer'
             )

plugins/core/player_manager_plugin/manager.py

@@ -282,7 +282,7 @@ def __init__(self, config):
         logger.info('Loading player database.')
         try:
             self.engine = create_engine(
-                'sqlite:///'.format(
+                'sqlite:///{}'.format(
                     path.preauthChild(self.config.player_db).path
                 )
             )

plugins/core/player_manager_plugin/plugin.py

@@ -246,7 +246,8 @@ def nick(self, data):
             self.factory.broadcast(
                 '{}^green;\'s name has been changed to {}'.format(
                     old_name,
-                    self.protocol.player.colored_name(self.config.colors))
+                    self.protocol.player.colored_name(self.config.colors)
+                )
             )
 
     @permissions(UserLevels.ADMIN)

plugins/web_gui/web_gui.py

@@ -46,7 +46,7 @@ def post(self):
             )
             self.factory.broadcast(
                 'An admin has joined the server through Web-GUI.',
-                0, self.get_argument('name', strip=False)
+                self.get_argument('name', strip=False)
             )
             self.failed_login = False
             self.redirect(self.get_argument('next', '/'))
@@ -353,9 +353,7 @@ def on_message(self, message):
                 time=datetime.now().strftime('%H:%M'),
                 user_name=self.web_gui_user.name,
                 message=messagejson['message']
-            ),
-            0,
-            ''
+            )
         )
 
     def update_chat(self):

server.py

@@ -702,13 +702,12 @@ def stopFactory(self):
         self.config.save()
         self.plugin_manager.die()
 
-    def broadcast(self, text, mode=1, name=''):
+    def broadcast(self, text, name=''):
         """
         Convenience method to send a broadcasted message to all clients on the
         server.
 
         :param text: Message text
-        :param mode: Channel to broadcast on. 0 is global, 1 is planet.
         :param name: The name to prepend before the message, format is <name>
         :return: None
         """