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

fix giving items to dead units, https://bugs.eressea.de/view.php?id=2230

This commit is contained in:
Enno Rehling 2016-08-21 11:58:53 +02:00
parent 6cfdc50fdf
commit a5c7d9b615
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/give.c
View File

@ -70,7 +70,11 @@ static void feedback_give_not_allowed(unit * u, order * ord)
static bool can_give(const unit * u, const unit * u2, const item_type * itype, int mask) static bool can_give(const unit * u, const unit * u2, const item_type * itype, int mask)
{ {
if (u2) { if (u2) {
if (u->faction != u2->faction) { if (u2->number==0 && !fval(u2, UFL_ISNEW)) {
// https://bugs.eressea.de/view.php?id=2230
// cannot give anything to dead units
return false;
} else if (u->faction != u2->faction) {
int rule = rule_give(); int rule = rule_give();
if (itype) { if (itype) {
assert(mask == 0); assert(mask == 0);