Resolve conflicts against master.

This commit is contained in:
Griatch 2017-02-11 18:17:04 +01:00
parent 91ffde5eaf
commit 831b1567ae
3 changed files with 6 additions and 8 deletions

View file

@ -105,7 +105,7 @@ def bot_data_in(session, *args, **kwargs):
return
kwargs.pop("options", None)
# Trigger the execute_cmd method of the corresponding bot.
session.player.execute_cmd(text=txt, session=session)
session.player.execute_cmd(session=session, text=txt, **kwargs)
session.update_session_counters()