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

Fixed a regression that had non-persistent Scripts not being deleted as they should on server reload. Also prepared for the same functionality for tickerhandler tickers.

Browse source
This commit is contained in:
Griatch 2016-03-24 19:43:54 +01:00
parent 42d18e3fd7
commit e09a172854
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/server/server.py
View file

@ -280,7 +280,7 @@ class Evennia(object):
MONITOR_HANDLER.restore() MONITOR_HANDLER.restore()
from evennia.scripts.tickerhandler import TICKER_HANDLER from evennia.scripts.tickerhandler import TICKER_HANDLER
TICKER_HANDLER.restore() TICKER_HANDLER.restore(mode in ('True', 'reload'))
# call correct server hook based on start file value # call correct server hook based on start file value
if mode in ('True', 'reload'): if mode in ('True', 'reload'):
@ -437,6 +437,11 @@ class Evennia(object):
from evennia.objects.models import ObjectDB from evennia.objects.models import ObjectDB
ObjectDB.objects.clear_all_sessids() ObjectDB.objects.clear_all_sessids()
# Remove non-persistent scripts
from evennia.scripts.models import ScriptDB
for script in ScriptDB.objects.filter(db_persistent=False):
script.stop()
if GUEST_ENABLED: if GUEST_ENABLED:
for guest in PlayerDB.objects.all().filter(db_typeclass_path=settings.BASE_GUEST_TYPECLASS): for guest in PlayerDB.objects.all().filter(db_typeclass_path=settings.BASE_GUEST_TYPECLASS):
for character in guest.db._playable_characters: for character in guest.db._playable_characters: