Release 1.2.3

Author: AMorporkian

packets/data_types.py

@@ -70,21 +70,27 @@ def _encode(self, obj, context):
     def _decode(self, obj, context):
         return obj.string
 
+
 class Joiner(Adapter):
     def _encode(self, obj, context):
         return obj
+
     def _decode(self, obj, context):
         return "".join(obj)
+
+
 star_string_struct = lambda name="star_string": Struct(name,
                                                        VLQ("length"),
                                                        String("string", lambda ctx: ctx.length)
 )
 
+
 class VariantVariant(Construct):
     def _parse(self, stream, context):
         l = VLQ("").parse_stream(stream)
         return [Variant("").parse_stream(stream) for _ in range(l)]
 
+
 class DictVariant(Construct):
     def _parse(self, stream, context):
         l = VLQ("").parse_stream(stream)
@@ -114,9 +120,11 @@ def _parse(self, stream, context):
         elif x == 7:
             return DictVariant("").parse_stream(stream)
 
+
 class StarByteArray(Construct):
     def _parse(self, stream, context):
         l = VLQ("").parse_stream(stream)
         return _read_stream(stream, l)
+
     def _build(self, obj, stream, context):
-        _write_stream(stream, len(obj), VLQ("").build(len(obj))+obj)
+        _write_stream(stream, len(obj), VLQ("").build(len(obj)) + obj)

plugins/core/admin_commands_plugin/admin_command_plugin.py

@@ -62,11 +62,12 @@ def promote(self, data):
             self.logger.trace("Player object in promote command, found by name, is %s." % str(player))
             if player is not None:
                 self.logger.trace("Player object was not None. Dump of player object follows.")
-                for line in pprint.pformat(player):
-                    self.logger.trace("\t"+line)
+                for line in pprint.pformat(player).split("\n"):
+                    self.logger.trace("\t" + line)
                 old_rank = player.access_level
                 if old_rank >= self.protocol.player.access_level:
-                    self.logger.trace("The old rank was greater or equal to the current rank. Sending a message and returning.")
+                    self.logger.trace(
+                        "The old rank was greater or equal to the current rank. Sending a message and returning.")
                     self.protocol.send_chat_message(
                         "You cannot change that user's access level as they are at least at an equal level as you.")
                     return

plugins/core/player_manager/manager.py

@@ -115,7 +115,8 @@ def colored_name(self, colors):
         logger.trace("Color is %s", color)
         name = self.name
         logger.trace("Name is %s", name)
-        logger.trace("Returning the following data for colored name. %s:%s:%s", color, name, colors['default'])
+        logger.trace("Returning the following data for colored name. %s:%s:%s", color, name,
+                     colors['default'])
         return color + name + colors["default"]
 
     @property

plugins/core/player_manager/plugin.py

@@ -138,4 +138,4 @@ def format_player_response(self, players):
                 "Results: %s" % "\n".join(["%s: %s" % (player.uuid, player.name) for player in players[:25]]))
             self.protocol.send_chat_message(
                 "And %d more. Narrow it down with SQL like syntax. Feel free to use a *, it will be replaced appropriately." % (
-                len(players) - 25))
+                    len(players) - 25))

plugins/core/starbound_config_manager/starbound_config_manager.py

@@ -29,12 +29,11 @@ def activate(self):
         if self.config.upstream_port != starbound_config['gamePort']:
             raise FatalPluginError(
                 "The starbound gamePort option (%d) does not match the config.json value (%d)." % (
-                starbound_config['gamePort'], self.config.upstream_port))
+                    starbound_config['gamePort'], self.config.upstream_port))
         self._spawn = starbound_config['defaultWorldCoordinate'].split(":")
 
     @permissions(UserLevels.GUEST)
     def spawn(self, data):
         """Moves your ship to spawn. Syntax: /move_ship_to_spawn"""
-        print self._spawn
         self.plugins['warpy_plugin'].move_player_ship(self.protocol, [x for x in self._spawn])
         self.protocol.send_chat_message("Moving your ship to spawn.")