Fix tend land not to wipe out concurrent updates

Fix tend_land() to bail out if the tender changed while tend_land()
slept for the last argument (receiving ship).
(cherry picked from commit 1ee02194c517e773888f2644c5dde30ac14f6f20)

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 2c7dba377b3e73826da7075be9316c9283728c83..c859d48815c57e7329d823864504368b041bd12e 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -227,7 +227,7 @@ tend_land(struct shpstr *tenderp, char *units)
        if (!snxtitem(&targets, EF_SHIP,
                      player->argp[4], "Ship to be tended? "))
            return RET_FAIL;
        if (!snxtitem(&targets, EF_SHIP,
                      player->argp[4], "Ship to be tended? "))
            return RET_FAIL;

-       if (!check_land_ok(&land))
+       if (!check_ship_ok(tenderp) || !check_land_ok(&land))

            return RET_SYN;
        while (nxtitem(&targets, &target)) {
            if (!player->owner &&
            return RET_SYN;
        while (nxtitem(&targets, &target)) {
            if (!player->owner &&