From 8b150ce4194925410881b98a0467d954991f2657 Mon Sep 17 00:00:00 2001
From: Vincent Le Goff <vincent.legoff.srs@gmail.com>
Date: Mon, 12 Jun 2017 13:32:08 -0700
Subject: [PATCH] [Event system] Check that the script has valid non-attributes
 before using it

---
 evennia/contrib/events/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evennia/contrib/events/utils.py b/evennia/contrib/events/utils.py
index 9ecb3544ec..4380f92b70 100644
--- a/evennia/contrib/events/utils.py
+++ b/evennia/contrib/events/utils.py
@@ -57,6 +57,7 @@ def register_events(path_or_typeclass):
     try:
         storage = ScriptDB.objects.get(db_key="event_handler")
         assert storage.is_active
+        assert storage.ndb.events is not None
     except (ScriptDB.DoesNotExist, AssertionError):
         storage = EVENTS