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

Fixed errors in bridge room. Some issues with tickerhandler starting with an invalid interval.

Browse source
This commit is contained in:
Griatch 2015-02-22 09:01:15 +01:00
parent 6f4cbbc1be
commit 5af3617d4e
7 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/cmdhandler.py
View file

@ -146,7 +146,6 @@ def get_and_merge_cmdsets(caller, session, player, obj,
yield [lobj.cmdset.current for lobj in local_objlist
if (lobj.cmdset.current and
lobj.locks.check(caller, 'call', no_superuser_bypass=True))]
print "local_obj_cmdsets:", [c.key for c in local_obj_cmdsets]
for cset in local_obj_cmdsets:
#This is necessary for object sets, or we won't be able to
# separate the command sets from each other in a busy room.
@ -210,7 +209,6 @@ def get_and_merge_cmdsets(caller, session, player, obj,
if cmdsets:
# faster to do tuple on list than to build tuple directly
mergehash = tuple([id(cmdset) for cmdset in cmdsets])
print "mergehash:", mergehash, mergehash in _CMDSET_MERGE_CACHE, [(c.key, c.priority) for c in cmdsets]
if mergehash in _CMDSET_MERGE_CACHE:
# cached merge exist; use that
cmdset = _CMDSET_MERGE_CACHE[mergehash]