From dc5d790b44c6f3a561c4e8e69b05be87cd25ec1e Mon Sep 17 00:00:00 2001 From: Vincent Le Goff Date: Sun, 23 Apr 2017 17:14:57 -0700 Subject: [PATCH] Update eventfuncs to try to load world/eventfuncs.py if exists --- evennia/contrib/events/scripts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/evennia/contrib/events/scripts.py b/evennia/contrib/events/scripts.py index 66a6cf164d..ba03714bd6 100644 --- a/evennia/contrib/events/scripts.py +++ b/evennia/contrib/events/scripts.py @@ -13,7 +13,7 @@ from evennia import DefaultObject, DefaultScript, ChannelDB, ScriptDB from evennia import logger from evennia.utils.create import create_channel from evennia.utils.dbserialize import dbserialize -from evennia.utils.utils import all_from_module, delay +from evennia.utils.utils import all_from_module, delay, pypath_to_realpath from evennia.contrib.events.callbackhandler import CallbackHandler from evennia.contrib.events.utils import get_next_wait, EVENTS, InterruptEvent @@ -69,9 +69,10 @@ class EventHandler(DefaultScript): self.ndb.current_locals = {} self.ndb.fresh_locals = {} addresses = ["evennia.contrib.events.eventfuncs"] - addresses.extend(getattr(settings, "EVENTFUNCS_LOCATIONS", [])) + addresses.extend(getattr(settings, "EVENTFUNCS_LOCATIONS", ["world.eventfuncs"])) for address in addresses: - self.ndb.fresh_locals.update(all_from_module(address)) + if pypath_to_realpath(address): + self.ndb.fresh_locals.update(all_from_module(address)) # Restart the delayed tasks now = datetime.now()