From 37e408da625b996af03fcdfa6347a16d2cae4934 Mon Sep 17 00:00:00 2001
From: Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 1 Mar 2007 12:52:11 +0000
Subject: git-svn-id:
 https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9942
 54d463be-8e91-2dee-dedb-b68131a5f0ec

---
 npc/merchants/socket_enchant.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'npc/merchants')

diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index ba61b71e0..ee1818ab6 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Sousuke_PL
 //===== Current Version: =====================================
-//= 0.3
+//= 1.0
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -14,6 +14,7 @@
 //= 0.1b Removed duplicates [Toms]
 //= 0.2	Added missing next;'s [Evera]
 //= 0.3 Fixed Zweihander[+] id [Lupus]
+//= 1.0 Fixed ingredients check [Lupus]
 //============================================================
 
 
@@ -613,7 +614,7 @@ function	script	addslot2	{
 
            if(countitem(@olditem)<1) goto L_NoItem;
            if(Zeny<@addprice) goto L_NoZeny;
-           if((countitem(@itemup1)<@itemupiece1) && (countitem(@itemup2)<@itemupiece2)) goto L_NoItemUp;
+           if(countitem(@itemup1)<@itemupiece1 || countitem(@itemup2)<@itemupiece2) goto L_NoItemUp;
 
            delitem @itemup1,@itemupiece1;
            delitem @itemup2,@itemupiece2;
-- 
cgit v1.2.3-60-g2f50