Merge. Resolves Issue 254. Resolves Issue 255.
This commit is contained in:
commit
8ad58a3e19
1 changed files with 4 additions and 4 deletions
|
|
@ -323,10 +323,10 @@ class CmdDrop(MuxCommand):
|
||||||
caller.msg("Drop what?")
|
caller.msg("Drop what?")
|
||||||
return
|
return
|
||||||
|
|
||||||
results = caller.search(self.args, ignore_errors=True)
|
# Because the DROP command by definition looks for items
|
||||||
# we process the results ourselves since we want to sift out only
|
# in inventory, call the search function using location = caller
|
||||||
# those in our inventory.
|
results = caller.search(self.args, location=caller, ignore_errors=True)
|
||||||
results = [obj for obj in results if obj in caller.contents]
|
|
||||||
# now we send it into the error handler (this will output consistent
|
# now we send it into the error handler (this will output consistent
|
||||||
# error messages if there are problems).
|
# error messages if there are problems).
|
||||||
obj = AT_SEARCH_RESULT(caller, self.args, results, False)
|
obj = AT_SEARCH_RESULT(caller, self.args, results, False)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue