Multiplayer: fix custody slapping for client players (#4872)

Author: rainlizard

src/thing_creature.c

@@ -6529,32 +6529,23 @@ TngUpdateRet update_creature(struct Thing *thing)
 
 TbBool creature_is_slappable(const struct Thing *thing, PlayerNumber plyr_idx)
 {
-    struct Room *room;
-    if (creature_is_being_unconscious(thing))
-    {
+    if (creature_is_being_unconscious(thing)) {
         return false;
     }
-    if (creature_is_leaving_and_cannot_be_stopped(thing))
-    {
+    if (creature_is_leaving_and_cannot_be_stopped(thing)) {
         return false;
     }
-    if (thing->owner != plyr_idx)
-    {
-        if (creature_is_kept_in_prison(thing) || creature_is_being_tortured(thing))
-        {
-            room = get_room_creature_works_in(thing);
-            return (room->owner == plyr_idx);
+    if (thing->owner != plyr_idx) {
+        if (creature_is_kept_in_prison(thing) || creature_is_being_tortured(thing)) {
+            return creature_is_kept_in_custody_by_player(thing, plyr_idx);
         }
         return false;
     }
-    if (creature_is_being_sacrificed(thing) || creature_is_being_summoned(thing))
-    {
+    if (creature_is_being_sacrificed(thing) || creature_is_being_summoned(thing)) {
         return false;
     }
-    if (creature_is_kept_in_prison(thing) || creature_is_being_tortured(thing))
-    {
-        room = get_room_creature_works_in(thing);
-        return (room->owner == plyr_idx);
+    if (creature_is_kept_in_prison(thing) || creature_is_being_tortured(thing)) {
+        return creature_is_kept_in_custody_by_player(thing, plyr_idx);
     }
     return true;
 }