From af89dd1ef7a1adc976ccd231375534c1b1e120b1 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 12 Sep 2010 16:19:02 +0000 Subject: [PATCH] Some minor bugfixes. --- game/gamesrc/commands/default/privileged.py | 7 ++++--- src/objects/manager.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/game/gamesrc/commands/default/privileged.py b/game/gamesrc/commands/default/privileged.py index 1cd64b38b5..0b6e0fda86 100644 --- a/game/gamesrc/commands/default/privileged.py +++ b/game/gamesrc/commands/default/privileged.py @@ -535,13 +535,14 @@ class CmdNewPassword(MuxCommand): return # the player search also matches 'me' etc. - player = caller.search("*%s" % self.lhs, global_search=True) - if not player: + character = caller.search("*%s" % self.lhs, global_search=True) + if not character: return + player = character.player player.user.set_password(self.rhs) player.user.save() caller.msg("%s - new password set to '%s'." % (player.name, self.rhs)) - if player != caller: + if character != caller: player.msg("%s has changed your password to '%s'." % (caller.name, self.rhs)) class CmdHome(MuxCommand): diff --git a/src/objects/manager.py b/src/objects/manager.py index 8fa4dc8065..566576993f 100644 --- a/src/objects/manager.py +++ b/src/objects/manager.py @@ -279,7 +279,7 @@ class ObjectManager(TypedObjectManager): if str(ostring).startswith("*"): # Player search - try to find obj by its player's name player_string = ostring.lstrip("*") - player_match = self.get_obj_with_player(player_string) + player_match = self.get_object_with_player(player_string) if player_match is not None: return [player_match]