badhouseplants/open-strike-2
4
0
Fork 0
Code Issues 11 Pull Requests 4 Actions Packages Projects 2 Releases Activity

WIP: Handle player disconnected

Browse Source
This commit is contained in:
Nikolai Rodionov 2025-01-30 10:09:40 +01:00
parent c62b2d7a09
commit c877e81562
Signed by: allanger
GPG Key ID: 09F8B434D0FDD99B
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scenes/maps/base/map_loader.gd
View File

@ -34,11 +34,11 @@ func _ready() -> void:
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void: func _process(delta: float) -> void:
var active_players = player_spawner._get_root().get_children() if multiplayer.is_server():
for n in active_players: var active_players = player_spawner._get_root().get_children()
if n.owner: for n in active_players:
if not GameServerManager.players.has(n.owner): if not GameServerManager.players.has(n.owner_id):
_remove_player(n.owner) _remove_player(n.owner_id)
@rpc("call_local", "reliable", "any_peer") @rpc("call_local", "reliable", "any_peer")
func _request_spawn(id: int): func _request_spawn(id: int):

6
scenes/maps/base/player_spawner/player_spawner.gd
View File

@ -32,6 +32,10 @@ func spawn_players(spawn_location: SpawnController, id: int) -> Error:
func remove_player(id: int) -> Error: func remove_player(id: int) -> Error:
if multiplayer.is_server(): if multiplayer.is_server():
_get_root().find_child("PlayerPlaceholder_" + str(id)).queue_free() var found_childen: Array[Node] =_get_root().get_children()
for found_child in found_childen:
if found_child.owner_id:
if found_child.owner_id == id:
found_child.queue_free()
return OK return OK
return ERR_UNAUTHORIZED return ERR_UNAUTHORIZED

2
scenes/player/placeholder.gd
View File

@ -64,10 +64,8 @@ func send_position(x: float, y: float, z: float):
var real_position: Vector3 = server_node.global_position var real_position: Vector3 = server_node.global_position
var difference: Vector3 = desired_position - real_position var difference: Vector3 = desired_position - real_position
if is_vector_a_lower_than_b(difference, Vector3(0.1, 0.1, 0.1)): if is_vector_a_lower_than_b(difference, Vector3(0.1, 0.1, 0.1)):
print("trustin")
server_node.global_position = desired_position server_node.global_position = desired_position
else: else:
print("not trustin")
adjust_position.rpc_id(owner_id, real_position.x, real_position.y, real_position.z) adjust_position.rpc_id(owner_id, real_position.x, real_position.y, real_position.z)
@rpc("authority", "call_local") @rpc("authority", "call_local")

1
scenes/utils/menus/main/main_menu.gd
View File

@ -5,7 +5,6 @@ var player_manager: PlayerManager = PlayerManager.new()
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready() -> void: func _ready() -> void:
if OS.has_feature("dedicated_server"): if OS.has_feature("dedicated_server"):
print("I'm here")
var chosen_map = "lowpoly_tdm_2.tscn" var chosen_map = "lowpoly_tdm_2.tscn"
var path_tmpl := "res://scenes/maps/maps/%s" var path_tmpl := "res://scenes/maps/maps/%s"
var path := path_tmpl % chosen_map var path := path_tmpl % chosen_map

2
scripts/game_server_manager.gd
View File

@ -22,7 +22,7 @@ func register_player(id: int, name: String):
player_state.name = name player_state.name = name
players[multiplayer.get_remote_sender_id()] = player_state players[multiplayer.get_remote_sender_id()] = player_state
@rpc("any_peer", "reliable", "call_remote") @rpc("any_peer", "reliable", "call_local")
func remove_player(id: int): func remove_player(id: int):
if multiplayer.is_server(): if multiplayer.is_server():
if players.has(id): if players.has(id):