Fixed chat colors, warping, and some connection issues. Oodles and oodles of trace logging added, but not enabled by default.

Author: AMorporkian

packet_stream.py

@@ -76,7 +76,7 @@ def check_packet(self):
                         self.logger.trace("Parsed packet:")
                         self.logger.trace(pprint.pformat(p_parsed))
                         self.logger.trace("Packet data:")
-                        self.logger.trace(pprint.pformat(p_parsed.original_data.enocde("hex")))
+                        self.logger.trace(pprint.pformat(p_parsed.original_data.encode("hex")))
                         self.logger.trace("Following packet data:")
                         self.logger.trace(pprint.pformat(self._stream.encode("hex")))
                         raise

plugins/core/admin_commands_plugin/__init__.py

@@ -1 +1 @@
-from plugins.core.admin_commands_plugin.admin_command_plugin import UserCommandPlugin, MuteManager
+from admin_command_plugin import UserCommandPlugin, MuteManager

plugins/core/admin_commands_plugin/admin_command_plugin.py

@@ -20,7 +20,6 @@ class UserCommandPlugin(SimpleCommandPlugin):
     def activate(self):
         super(UserCommandPlugin, self).activate()
         self.player_manager = self.plugins['player_manager'].player_manager
-        self.godmode = {}
 
     @permissions(UserLevels.GUEST)
     def who(self, data):

plugins/core/colored_names/colored_names.py

@@ -18,11 +18,10 @@ def activate(self):
     def on_chat_received(self, data):
         try:
             p = chat_received().parse(data.data)
-            print p
+            if p.name == "server":
+                return
             sender = self.player_manager.get_logged_in_by_name(p.name)
-            print sender
             p.name = sender.colored_name(self.config.colors)
-            print p.name
             self.protocol.transport.write(build_packet(Packets.CHAT_RECEIVED, chat_received().build(p)))
         except AttributeError as e:
             self.logger.warning("Received AttributeError in colored_name. %s", str(e))

plugins/core/player_manager/plugin.py

@@ -89,7 +89,7 @@ def after_world_start(self, data):
         if coords is not None:
             parent_system = coords['parentSystem']
             location = parent_system['location']
-            l = location['data']
+            l = location
             self.protocol.player.on_ship = False
             planet = Planet(parent_system['sector'], l[0], l[1], l[2],
                             coords['planetaryOrbitNumber'], coords['satelliteOrbitNumber'])

plugins/core/starbound_config_manager/starbound_config_manager.py

@@ -34,7 +34,7 @@ def activate(self):
 
     @permissions(UserLevels.GUEST)
     def spawn(self, data):
-        """Warps you to spawn. Syntax: /spawn"""
-        self.plugins['warpy_plugin'].move_player_ship(self.protocol, self._spawn)
+        """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.")
-

plugins/warpy_plugin/warpy_plugin.py

@@ -83,6 +83,11 @@ def warp_player_to_player(self, from_string, to_string):
             self.protocol.send_chat_message(self.warp.__doc__)
 
     def move_player_ship(self, protocol, location):
+        if len(location) < 5:
+            self.logger.warning("Couldn't derive a warp location in move_player_ship. Coordinates given: %s",
+                                ":".join(location))
+            self.protocol.send_chat_message("Sorry, an error occurred.")
+            return
         if len(location) == 5:
             satellite = 0
         else: