From 4add6a5ba3b45cf97a3731a8a38577e7506bca30 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 18 Dec 2007 15:01:18 +0000
Subject: - removed redundant clif_hominfo line in merc_hom_dead (it was sent
 already from hom_damage) - Item usage is now blocked while hidden. - Moved
 the bladestop/berserk check from clif_parse_EquipItem to pc_equipitem

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

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

diff --git a/src/map/pc.c b/src/map/pc.c
index 7d8a44e2e..13065ea24 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3079,6 +3079,7 @@ int pc_useitem(struct map_session_data *sd,int n)
 		(sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) ||
 		sd->sc.data[SC_TRICKDEAD] ||
 		sd->sc.data[SC_BLADESTOP] ||
+		sd->sc.data[SC_HIDING] ||
 		(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM)
 	))
 		return 0;
@@ -6325,9 +6326,8 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos)
 		return 0;
 	}
 
-// -- moonsoul (if player is berserk then cannot equip)
-//
-	if(sd->sc.data[SC_BERSERK]){
+	if(sd->sc.data[SC_BERSERK] || sd->sc.data[SC_BLADESTOP])
+	{
 		clif_equipitemack(sd,n,0,0);	// fail
 		return 0;
 	}
-- 
cgit v1.2.3-60-g2f50