From 7d4bf6c8d2793c145588c88782762f7754cbf2ee Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 25 Sep 2012 07:42:52 +0200 Subject: [PATCH] Fixes a bug in scriptmanager. Resolves Issue 259. --- src/scripts/manager.py | 6 +++--- src/utils/dummyrunner/dummyrunner_actions.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/scripts/manager.py b/src/scripts/manager.py index 4625c09851..18a2e79b98 100644 --- a/src/scripts/manager.py +++ b/src/scripts/manager.py @@ -45,9 +45,9 @@ class ScriptManager(TypedObjectManager): dbref = self.dbref(key) if dbref: script = self.filter(db_obj=obj, id=dbref) - if not script: - script = self.filter(db_obj=obj, db_key=key) - return script + if script: + return script + return self.filter(db_obj=obj, db_key=key) return self.filter(db_obj=obj) @returns_typeclass_list diff --git a/src/utils/dummyrunner/dummyrunner_actions.py b/src/utils/dummyrunner/dummyrunner_actions.py index f8416c5d77..7079a61b3d 100644 --- a/src/utils/dummyrunner/dummyrunner_actions.py +++ b/src/utils/dummyrunner/dummyrunner_actions.py @@ -193,8 +193,9 @@ def c_moves(client): ## "socializing heavy builder" definition ACTIONS = (c_login, c_logout, - (0.3, c_socialize), + (0.1, c_socialize), (0.1, c_looks), (0.1, c_help), + (0.2, c_creates_obj), (0.2, c_digs), (0.3, c_moves))