--- deliantra/server/server/move.c 2006/02/22 18:03:22 1.1.1.2 +++ deliantra/server/server/move.c 2006/02/22 18:53:56 1.4 @@ -31,6 +31,11 @@ #include #endif +#ifdef COZY_SERVER +// use a ptotoype +extern int same_party (partylist *a, partylist *b); +#endif + /* * move_object() tries to move object op in the direction "dir". * If it fails (something blocks the passage), it returns 0, @@ -412,7 +417,18 @@ /* player change place with his pets or summoned creature */ /* TODO: allow multi arch pushing. Can't be very difficult */ - if (who->more == NULL && owner == pusher) { + if (who->more == NULL +#ifdef COZY_SERVER + && + ( + (owner && owner->contr && pusher->contr + && same_party (owner->contr->party, pusher->contr->party)) + || owner == pusher + ) +#else + && owner == pusher +#endif + ) { int temp; mapstruct *m;