Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update eventfuncs to try to load world/eventfuncs.py if exists

Browse source
This commit is contained in:
Vincent Le Goff 2017-04-23 17:14:57 -07:00 • committed by Griatch
parent 16cbe2c781
commit dc5d790b44
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/contrib/events/scripts.py
View file

@ -13,7 +13,7 @@ from evennia import DefaultObject, DefaultScript, ChannelDB, ScriptDB
from evennia import logger from evennia import logger
from evennia.utils.create import create_channel from evennia.utils.create import create_channel
from evennia.utils.dbserialize import dbserialize 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.callbackhandler import CallbackHandler
from evennia.contrib.events.utils import get_next_wait, EVENTS, InterruptEvent from evennia.contrib.events.utils import get_next_wait, EVENTS, InterruptEvent
@ -69,9 +69,10 @@ class EventHandler(DefaultScript):
self.ndb.current_locals = {} self.ndb.current_locals = {}
self.ndb.fresh_locals = {} self.ndb.fresh_locals = {}
addresses = ["evennia.contrib.events.eventfuncs"] addresses = ["evennia.contrib.events.eventfuncs"]
addresses.extend(getattr(settings, "EVENTFUNCS_LOCATIONS", [])) addresses.extend(getattr(settings, "EVENTFUNCS_LOCATIONS", ["world.eventfuncs"]))
for address in addresses: 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 # Restart the delayed tasks
now = datetime.now() now = datetime.now()