diff --git a/evennia/scripts/tickerhandler.py b/evennia/scripts/tickerhandler.py index 9daaa68e0e..2ad2205b2a 100644 --- a/evennia/scripts/tickerhandler.py +++ b/evennia/scripts/tickerhandler.py @@ -443,7 +443,7 @@ class TickerHandler(object): kwargs["_callback"] = callfunc # either method-name or callable self.ticker_pool.add(store_key, *args, **kwargs) - def remove(self, interval=60, callback=None, idstring=""): + def remove(self, interval=60, callback=None, idstring="", persistent=True): """ Remove object from ticker or only remove it from tickers with a given interval. @@ -456,7 +456,7 @@ class TickerHandler(object): """ obj, path, callfunc = self._get_callback(callback) - store_key = self._store_key(obj, path, interval, callfunc, idstring) + store_key = self._store_key(obj, path, interval, callfunc, idstring, persistent) to_remove = self.ticker_storage.pop(store_key, None) if to_remove: self.ticker_pool.remove(store_key) diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py index 3785131ac8..06b5eb724f 100644 --- a/evennia/server/inputfuncs.py +++ b/evennia/server/inputfuncs.py @@ -277,7 +277,10 @@ def repeat(session, *args, **kwargs): if kwargs.get("stop", False): TICKER_HANDLER.remove(interval, _repeatable[name], idstring=session.sessid, persistent=False) else: - TICKER_HANDLER.add(interval, _repeatable[name], idstring=session.sessid, persistent=False) + TICKER_HANDLER.add(interval, _repeatable[name], idstring=session.sessid, persistent=False, session=session) + else: + session.msg("Allowed repeating functions are: %s" % (", ".join(_repeatable))) + def unrepeat(session, *args, **kwargs): @@ -337,7 +340,7 @@ def unmonitor(session, *args, **kwargs): # aliases for GMCP gmcp_core_hello = client_options # Core.Hello gmcp_core_supports_set = client_options # Core.Supports.Set -gmcp_core_supports_get = get_client_options # Core.Supports.Get +gmcp_core_supports_get = get_client_options # Evennia.Core.Supports.Get gmcp_core_commands_get = get_inputfuncs # Core.Commands.Get gmcp_char_login = login # Char.Login gmcp_char_value_get = get_value # Char.Value.Get