diff options
Diffstat (limited to 'scripts/Server.gd')
| -rw-r--r-- | scripts/Server.gd | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/scripts/Server.gd b/scripts/Server.gd index 531f30e..2814b7b 100644 --- a/scripts/Server.gd +++ b/scripts/Server.gd @@ -21,7 +21,7 @@ func _ready(): get_tree().connect("network_peer_connected", self, "_client_connect") get_tree().connect("network_peer_disconnected", self, "_client_disconnect") -func start_server(_server_name: String, _motd: String, max_players: int, map_path: String, ip: String, port: int, tree, output_obj, output_f): +func start_server(_server_name: String, _motd: String, max_players: int, map_path: String, _ip: String, port: int, tree, output_obj, output_f): output = output_obj output_func = output_f server_name = _server_name @@ -92,18 +92,23 @@ func _client_change_teams(arguments): func _client_request_change_character(arguments): var dest = world.get_node("PLAYERS/"+arguments["char_name"]) - if dest.get_network_master() == 1: + if dest != null and dest.get_network_master() == 1: print_line(connected_players[arguments["id"]][0] + " selected character " + arguments["char_name"]) - dest.rpc("set_owner", arguments["id"]) + dest.rpc("set_net_owner", arguments["id"]) if arguments["current_char_name"] != "NULL": var old = world.get_node("PLAYERS/"+arguments["current_char_name"]) - old.rpc("set_owner", 1) + old.rpc("set_net_owner", 1) + +func _client_request_control_vehicle(arguments): + var dest_machine = world.get_node("MACHINES/"+arguments["machine"]) + if dest_machine != null and dest_machine.get_network_master() == 1 and !dest_machine.in_use: + pass func _character_death(arguments): var victim_player = connected_players[arguments["victim_mp_id"]][0] if arguments["victim_mp_id"] != 1 else "" print_line(arguments["victim"] + " ("+victim_player+") killed by " + arguments["killer"] + " " + arguments["extra"] + ".") world.rpc("game_chat_msg", arguments["victim"] + " ("+victim_player+") killed by " + arguments["killer"] + " " + arguments["extra"] + ".") - world.get_node("PLAYERS/"+arguments["victim"]).rpc("remove_dead") + world.get_node("PLAYERS/"+arguments["victim"]).rpc("remove_dead_character") world.rpc("game_update_chars") func _send_chat(arguments): |