From 8c87d04a1e9928626f51b290ae45228306c1d91b Mon Sep 17 00:00:00 2001
From: zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 27 Mar 2008 03:25:51 +0000
Subject: - Fixed a bug in map_nick2sd (sometimes we can have 3 chars with
 similar names, and the "perfect match" in the 3º slot... or more).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12437 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/map.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/map/map.c')

diff --git a/src/map/map.c b/src/map/map.c
index 33a5343c4..07d672503 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1693,21 +1693,19 @@ struct map_session_data * map_nick2sd(const char *nick)
 	{
 		if( battle_config.partial_name_scan )
 		{// partial name search
+			int qty = 0;
+
 			if( strnicmp(sd->status.name, nick, nicklen) == 0 )
 			{
+				found_sd = sd;
+
 				if( strcmp(sd->status.name, nick) == 0 )
-				{// perfect match found
-					found_sd = sd;
-					break;
-				}
-				if( found_sd != NULL )
-				{// collision
-					found_sd = NULL;
-					break;
-				}
+					break; // Perfect Match
 
-				found_sd = sd;
+				qty++;
 			}
+
+			if( qty != 1 ) found_sd = NULL; // Collisions
 		}
 		else
 		{// exact search only
-- 
cgit v1.2.3-60-g2f50