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

Catch ObjectDoesNotExist exception when calling delete() in DefaultScript.stop(). Fixes 919

Browse source
This commit is contained in:
Kai Huang 2016-02-02 22:25:49 +08:00 • committed by Griatch
parent ed1b61a129
commit 88674307ec
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/scripts/scripts.py
View file

@ -7,6 +7,7 @@ ability to run timers.
from twisted.internet.defer import Deferred, maybeDeferred from twisted.internet.defer import Deferred, maybeDeferred
from twisted.internet.task import LoopingCall from twisted.internet.task import LoopingCall
from django.core.exceptions import ObjectDoesNotExist
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from evennia.typeclasses.models import TypeclassBase from evennia.typeclasses.models import TypeclassBase
from evennia.scripts.models import ScriptDB from evennia.scripts.models import ScriptDB
@ -353,6 +354,8 @@ class DefaultScript(ScriptBase):
except AssertionError: except AssertionError:
logger.log_trace() logger.log_trace()
return 0 return 0
except ObjectDoesNotExist:
pass
return 1 return 1
def pause(self, manual_pause=True): def pause(self, manual_pause=True):