From 534f336cada583adbe6867f1160c22e71fc046a0 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 14 Jul 2022 12:49:17 +0200
Subject: [PATCH] Add check for deserialization

---
 evennia/contrib/tutorials/evadventure/combat_turnbased.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/evennia/contrib/tutorials/evadventure/combat_turnbased.py b/evennia/contrib/tutorials/evadventure/combat_turnbased.py
index 967015e947..ddb313c72d 100644
--- a/evennia/contrib/tutorials/evadventure/combat_turnbased.py
+++ b/evennia/contrib/tutorials/evadventure/combat_turnbased.py
@@ -179,8 +179,9 @@ class CombatAction:
         The `__serialize_dbobjs__` and `__deserialize_dbobjs__` methods form a required pair.
 
         """
-        self.combathandler = dbserialize.dbunserialize(self.combathandler)
-        self.combatant = dbserialize.dbunserialize(self.combatant)
+        if isinstance(self.combathandler, bytes):
+            self.combathandler = dbserialize.dbunserialize(self.combathandler)
+            self.combatant = dbserialize.dbunserialize(self.combatant)
 
     def get_help(self, *args, **kwargs):
         """