From dc67f4b871913995ff3dc424be1177172172dbbd Mon Sep 17 00:00:00 2001
From: BattleJenkins <Tim@battlestudio.com>
Date: Wed, 29 Nov 2017 15:37:40 -0800
Subject: [PATCH] Ugh!!! TickerHandler changes, more

---
 evennia/contrib/tests.py               | 2 +-
 evennia/contrib/turnbattle/tb_items.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 7a3c660a72..8d40aeaadb 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -1307,7 +1307,7 @@ class TestTurnBattleFunc(EvenniaTest):
         turnhandler.stop()
         # Now time to test item stuff.
         user = create_object(tb_items.TBItemsCharacter, key="User")
-        tb_items.tickerhandler.remove(interval=30, callback=user.at_update)
+        tb_items.tickerhandler.remove(interval=30, callback=user.at_update, idstring="update")
         testroom = create_object(DefaultRoom, key="Test Room")
         user.location = testroom
         test_healpotion = create_object(key="healing potion")
diff --git a/evennia/contrib/turnbattle/tb_items.py b/evennia/contrib/turnbattle/tb_items.py
index f367fec269..dca5856fe5 100644
--- a/evennia/contrib/turnbattle/tb_items.py
+++ b/evennia/contrib/turnbattle/tb_items.py
@@ -497,7 +497,7 @@ class TBItemsCharacter(DefaultCharacter):
         self.db.hp = self.db.max_hp  # Set current HP to maximum
         self.db.conditions = {} # Set empty dict for conditions
         # Subscribe character to the ticker handler
-        tickerhandler.add(NONCOMBAT_TURN_TIME, self.at_update)
+        tickerhandler.add(NONCOMBAT_TURN_TIME, self.at_update, idstring="update")
         """
         Adds attributes for a character's current and maximum HP.
         We're just going to set this value at '100' by default.