From e89de9a27dc7e3138ae313804431270eebf56421 Mon Sep 17 00:00:00 2001
From: Madpeterz <57852827+Madpeterz@users.noreply.github.com>
Date: Sun, 3 Jan 2021 23:43:35 +0000
Subject: [PATCH] adds extra checks to name to key

---
 Core/bottypes/AVstorageBot.cs | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/Core/bottypes/AVstorageBot.cs b/Core/bottypes/AVstorageBot.cs
index c46d159..086f534 100644
--- a/Core/bottypes/AVstorageBot.cs
+++ b/Core/bottypes/AVstorageBot.cs
@@ -222,20 +222,23 @@ namespace BSB.bottypes
             if ((av_name != "null") && (av_name != null) && (av_name.ToLowerInvariant() != "secondlife") && (av_uuid != UUID.Zero))
             {
                 if (AvatarStorageLastUsed.ContainsKey(av_name) == false)
-                {
-                    if (av_uuid != UUID.Zero)
-                    {
-                        AvatarName2Key.Add(av_name, av_uuid);
-                        AvatarKey2Name.Add(av_uuid, av_name);
-                        AvatarStorageLastUsed.Add(av_name, helpers.UnixTimeNow());
-                        if (PendingAvatarFinds_vianame.ContainsKey(av_name) == true)
-                        {
-                            PendingAvatarFinds_vianame.Remove(av_name);
-                        }
-                        if (PendingAvatarFinds_viauuid.ContainsKey(av_uuid) == true)
-                        {
-                            PendingAvatarFinds_viauuid.Remove(av_uuid);
-                        }
+                {
+                    if (av_uuid != UUID.Zero)
+                    {
+                        if ((AvatarKey2Name.ContainsKey(av_uuid) == false) && (AvatarName2Key.ContainsKey(av_name) == false))
+                        {
+                            AvatarName2Key.Add(av_name, av_uuid);
+                            AvatarKey2Name.Add(av_uuid, av_name);
+                        }
+                        AvatarStorageLastUsed.Add(av_name, helpers.UnixTimeNow());
+                        if (PendingAvatarFinds_vianame.ContainsKey(av_name) == true)
+                        {
+                            PendingAvatarFinds_vianame.Remove(av_name);
+                        }
+                        if (PendingAvatarFinds_viauuid.ContainsKey(av_uuid) == true)
+                        {
+                            PendingAvatarFinds_viauuid.Remove(av_uuid);
+                        }
                     }
                 }
                 else