summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnieRuru <jeankof@ymail.com>2015-11-21 05:00:11 +0800
committerAnnieRuru <jeankof@ymail.com>2015-11-21 05:00:11 +0800
commit3eb8f6cc123835fae6bbd847f02cdd45fcfccd60 (patch)
tree293655a1afaf60f93408aad58a65a6e569e9b3a2
parentc37f7778137d69b297d6fcb43a8c5739f4fb5406 (diff)
downloadhercules-3eb8f6cc123835fae6bbd847f02cdd45fcfccd60.tar.gz
hercules-3eb8f6cc123835fae6bbd847f02cdd45fcfccd60.tar.bz2
hercules-3eb8f6cc123835fae6bbd847f02cdd45fcfccd60.tar.xz
hercules-3eb8f6cc123835fae6bbd847f02cdd45fcfccd60.zip
Fix getitem/getitem2 give stacked items when ForceSerial on (#703)
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index cfc7ed052..053917259 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7110,7 +7110,7 @@ BUILDIN(getitem) {
return true;
//Check if it's stackable.
- if (!itemdb->isstackable(nameid))
+ if (!itemdb->isstackable(nameid) || item_data->flag.force_serial)
get_count = 1;
else
get_count = amount;
@@ -7218,7 +7218,7 @@ BUILDIN(getitem2)
item_tmp.card[3]=(short)c4;
//Check if it's stackable.
- if (!itemdb->isstackable(nameid))
+ if (!itemdb->isstackable(nameid) || item_data->flag.force_serial)
get_count = 1;
else
get_count = amount;