summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 7d508eb21..f5066551a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10010,18 +10010,11 @@ void clif_parse_TakeItem(int fd, struct map_session_data *sd)
if (fitem == NULL || fitem->bl.type != BL_ITEM || fitem->bl.m != sd->bl.m)
break;
-
- if (pc_cant_act(sd))
- break;
- if(sd->sc.count && (
- sd->sc.data[SC_HIDING] ||
- sd->sc.data[SC_CLOAKING] ||
- sd->sc.data[SC_TRICKDEAD] ||
- sd->sc.data[SC_BLADESTOP] ||
- sd->sc.data[SC_CLOAKINGEXCEED] ||
- (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM))
- )
+ if( sd->sc.cant.pickup )
+ break;
+
+ if (pc_cant_act(sd))
break;
if (!pc_takeitem(sd, fitem))