From 0d0002837446fe4e7e0cc20f142a5830fad0c64b Mon Sep 17 00:00:00 2001
From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com>
Date: Mon, 8 Dec 2025 21:52:22 -0700
Subject: [PATCH] fix clone num logic

---
 evennia/objects/objects.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 61890feca0..1f2bd94021 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -1509,11 +1509,13 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
             returns the new clone name on the form keyXX
             """
             key = self.key
-            num = sum(
-                1
-                for obj in self.location.contents
-                if obj.key.startswith(key) and obj.key.lstrip(key).isdigit()
-            )
+            num = 1
+            if self.location:
+                num = max(0, *[
+                    int(obj.key.lstrip(key) or 0)
+                    for obj in self.location.contents
+                    if obj.key.startswith(key)
+                ])+1
             return "%s%03i" % (key, num)
 
         new_key = new_key or find_clone_key()