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

Merge branch 'events' of https://github.com/vlegoff/evennia into vlegoff-events

Browse source
This commit is contained in:
Griatch 2017-05-21 07:18:57 +02:00
commit 94786c03a2
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/contrib/events/scripts.py
View file

@ -45,7 +45,6 @@ class EventHandler(DefaultScript):
self.db.locked = [] self.db.locked = []
# Tasks # Tasks
self.db.task_id = 0
self.db.tasks = {} self.db.tasks = {}
def at_start(self): def at_start(self):
@ -559,8 +558,12 @@ class EventHandler(DefaultScript):
""" """
now = datetime.now() now = datetime.now()
delta = timedelta(seconds=seconds) delta = timedelta(seconds=seconds)
task_id = self.db.task_id
self.db.task_id += 1 # Choose a free task_id
used_ids = list(self.db.tasks.keys())
task_id = 1
while task_id in used_ids:
task_id += 1
# Collect and freeze current locals # Collect and freeze current locals
locals = {} locals = {}

1
evennia/contrib/events/tests.py
View file

@ -58,7 +58,6 @@ class TestEventHandler(EvenniaTest):
self.assertEqual(self.handler.db.to_valid, []) self.assertEqual(self.handler.db.to_valid, [])
self.assertEqual(self.handler.db.locked, []) self.assertEqual(self.handler.db.locked, [])
self.assertEqual(self.handler.db.tasks, {}) self.assertEqual(self.handler.db.tasks, {})
self.assertEqual(self.handler.db.task_id, 0)
self.assertIsNotNone(self.handler.ndb.events) self.assertIsNotNone(self.handler.ndb.events)
def test_add_validation(self): def test_add_validation(self):