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

Don't allow 3-box with only two boxes in room. Resolve #2206.

Browse source
This commit is contained in:
Griatch 2020-11-13 20:59:49 +01:00
parent 5f8911ec72
commit 490c4f11cf
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/objects/manager.py
View file

@ -471,7 +471,12 @@ class ObjectDBManager(TypedObjectManager):
matches = _searcher(searchdata, candidates, typeclass, exact=exact)
# deal with result
if len(matches) > 1 and match_number is not None:
if len(matches) == 1 and match_number is not None and match_number != 0:
# this indicates trying to get a single match with a match-number
# targeting some higher-number match (like 2-box when there is only
# one box in the room). This leads to a no-match.
matches = []
elif len(matches) > 1 and match_number is not None:
# multiple matches, but a number was given to separate them
if 0 <= match_number < len(matches):
# limit to one match