Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug in last change, could not give items to peasants.

This commit is contained in:
Enno Rehling 2021-03-04 15:49:12 +01:00
parent 5df3c3dc4b
commit 010dde1cb8
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/give.c
View File

@ -1004,25 +1004,23 @@ param_t give_cmd(unit * u, order * ord)
} }
} }
} }
else if (u2 != NULL) { else if (u2 != NULL && !(u_race(u2)->ec_flags & ECF_GETITEM)) {
if (!(u_race(u2)->ec_flags & ECF_GETITEM)) { ADDMSG(&u->faction->msgs,
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "race_notake", "race", u_race(u2)));
msg_feedback(u, ord, "race_notake", "race", u_race(u2))); }
} else {
else { itype = finditemtype(s, u->faction->locale);
itype = finditemtype(s, u->faction->locale); if (itype != NULL) {
if (itype != NULL) { if (can_give(u, u2, itype, 0)) {
if (can_give(u, u2, itype, 0)) { give_item(n, itype, u, u2, ord);
give_item(n, itype, u, u2, ord);
}
else {
feedback_give_not_allowed(u, ord);
}
} }
else { else {
cmistake(u, ord, 123, MSG_COMMERCE); feedback_give_not_allowed(u, ord);
} }
} }
else {
cmistake(u, ord, 123, MSG_COMMERCE);
}
} }
} }
return p; return p;