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

Change validation syntax, spawn mechanism not working

Browse source
This commit is contained in:
Griatch 2018-03-10 14:43:11 +01:00
parent dd16d97834
commit 43ecca0d41
2 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/commands/default/building.py
View file

@ -14,7 +14,7 @@ from evennia.utils.utils import inherits_from, class_from_module
from evennia.utils.eveditor import EvEditor
from evennia.utils.evmore import EvMore
from evennia.utils.spawner import (spawn, search_prototype, list_prototypes,
store_prototype, build_metaproto)
store_prototype, build_metaproto, validate_prototype)
from evennia.utils.ansi import raw
COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
@ -2806,6 +2806,11 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
self.caller.msg("Spawn aborted: You don't have access to "
"use the 'exec' prototype key.")
return None
try:
validate_prototype(prototype)
except RuntimeError as err:
self.caller.msg(str(err))
return
return prototype
def _search_show_prototype(query, metaprots=None):