Merge branch 'master' into develop

2018-10-06 21:20:10 +02:00 · 2018-10-06 21:20:10 +02:00 · c0c36a8641
commit c0c36a8641
parent 1a130a830d 550a25820d
4 changed files with 50 additions and 14 deletions
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@ -2889,7 +2889,8 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
                                    "use the 'exec' prototype key.")
                    return None
                try:
-                    protlib.validate_prototype(prototype)
+                    # we homogenize first, to be more lenient
+                    protlib.validate_prototype(protlib.homogenize_prototype(prototype))
                except RuntimeError as err:
                    self.caller.msg(str(err))
                    return