forked from github/server
fix bug in last change, could not give items to peasants.
This commit is contained in:
parent
5df3c3dc4b
commit
010dde1cb8
|
@ -1004,8 +1004,7 @@ 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)));
|
||||||
}
|
}
|
||||||
|
@ -1024,7 +1023,6 @@ param_t give_cmd(unit * u, order * ord)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue