From e2fcbe131ec9d296d3175ce2fcafcfbcf058f916 Mon Sep 17 00:00:00 2001 From: hgn Date: Mon, 27 Nov 2023 07:03:54 +0000 Subject: [PATCH] wrong world display --- player_remote.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/player_remote.c b/player_remote.c index 7256fbd..b4a5c10 100644 --- a/player_remote.c +++ b/player_remote.c @@ -616,6 +616,8 @@ static void render_remote_players( world_instance *world, camera *cam ){ struct network_player *player = &netplayers.list[i]; if( !player->active || player->isblocked ) continue; if( player->active_world != world ) continue; + if( !player->isfriend && + (world-world_static.instances == k_world_purpose_hub)) continue; m4x3f *final_mtx = &netplayers.final_mtx[ sk->bone_count*i ]; @@ -877,8 +879,7 @@ static void remote_players_imgui_lobby(void){ struct network_player *player = &netplayers.list[i]; if( !player->active || player->isblocked ) continue; - int in_same_world = player->active_world != world_current_instance(); - + int in_same_world = player->active_world == world_current_instance(); if( !player->isfriend && !in_same_world ) continue; @@ -906,6 +907,8 @@ static void remote_players_imgui_world( world_instance *world, m4x4f pv, if( !player->active_world ) continue; + if( !player->isfriend && + (world-world_static.instances == k_world_purpose_hub)) continue; /* their in our active subworld */ if( player->active_world != world ){ -- 2.25.1