Merge pull request #22 from MrMarvin/managing_merge_mess

Managing merge mess

Author: AMorporkian

plugins/admin_commands_plugin/admin_command_plugin.py

@@ -68,10 +68,6 @@ def promote(self, data):
             player = self.player_manager.get_by_name(name)
             if player is not None:
                 old_rank = player.access_level
-                self.protocol.send_chat_message(
-                "%s: %s -> %s\n" % (
-                    player.colored_name(self.config.colors), str(UserLevels(old_rank)),
-                    str(UserLevels(player.access_level))))
                 if rank == "admin":
                     self.make_admin(player)
                 elif rank == "moderator":
@@ -83,9 +79,14 @@ def promote(self, data):
                 else:
                     self.protocol.send_chat_message("No such rank!\n"+usage)
                     return
+
+                self.protocol.send_chat_message("%s: %s -> %s" % (
+                    player.colored_name(self.config.colors), str(UserLevels(old_rank)).split(".")[1],
+                    rank.upper()))
+                self.protocol.factory.protocols[player.protocol].send_chat_message("%s has promoted you to %s" % (
+                    player.colored_name(self.config.colors), rank.upper()))
             else:
                 self.protocol.send_chat_message("Player not found!\n"+usage)
-
                 return
         else:
             self.protocol.send_chat_message(usage)