From f107fd62549c6701eb002f5b84a8031bced30ead Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 29 Jan 2005 08:57:25 +0000
Subject: [PATCH] fixed named item storage dupe in sql

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1013 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog.txt       | 2 ++
 src/char_sql/char.c | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index d2fff140c6..4ca45ceb86 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,8 @@
 Date	Added
 
 01/29
+	* Fixed Storage Bug with Named Stackable items. Thanks to Nimion [Lupus]
+		e.g. Arrows, Iron, Elemental stones, etc...
         * Added a crash check to Safety Wall, thanks to LebrEf[TaVu] / Freya for
           pointing it out [celest]
         * Added some optimisations in clif_parse_MapMove, by Ilpalazzo-sama [celest]
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index b745ea5043..4c8d7e29f7 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -815,10 +815,11 @@ int memitemdata_to_sql(struct itemtemp mapitem, int eqcount, int noteqcount, int
 							//printf("the same item : %d ; i : %d ; flag :  %d\n", mapitem.notequip[i].nameid, i, mapitem.notequip[i].flag); //DEBUG-STRING
 						}
 						else{
+							//named item dupe bugfix by Nimion [Lupus]
 							sprintf(tmp_sql,"UPDATE `%s` SET `amount`='%d', `equip`='%d', `identify`='%d',"
-							"`attribute`='%d' WHERE `%s`='%d' AND `nameid`='%d'",
+							"`attribute`='%d' WHERE `%s`='%d' AND `nameid`='%d' AND `card0`='%d' AND `card2`='%d'",
 							tablename, mapitem.notequip[i].amount, mapitem.notequip[i].equip, mapitem.notequip[i].identify, mapitem.notequip[i].attribute,
-							selectoption, char_id, mapitem.notequip[i].nameid);
+							selectoption, char_id, mapitem.notequip[i].nameid,mapitem.notequip[i].card[0],mapitem.notequip[i].card[2]);
 							//printf("%s",tmp_sql);
 							if(mysql_query(&mysql_handle, tmp_sql))
 								printf("DB server Error (UPdate `notequ %s`)- %s\n",tablename ,mysql_error(&mysql_handle));