added local servers

1 files changed, 7 insertions, 4 deletions

diff --git a/scripts/Server.gd b/scripts/Server.gd
index bd24911..531f30e 100644
--- a/scripts/Server.gd
+++ b/scripts/Server.gd
@@ -12,13 +12,16 @@ var output
 var output_func : String
 
 func print_line(line):
+	if output == null:
+		print("SERVER: " + line)
+		return
 	output.call(output_func, line)
 
 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, root, 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
@@ -33,12 +36,13 @@ func start_server(_server_name: String, _motd: String, max_players: int, map_pat
 		return
 
 	world.add_child(self)
-	root.add_child(world)
+	tree.get_root().add_child(world)
+
 	world.client_id = 1
 	
 	server_enet = NetworkedMultiplayerENet.new()
 	server_enet.create_server(port, max_players)
-	get_tree().set_network_peer(server_enet)
+	tree.set_network_peer(server_enet)
 	
 	print_line("Server started successfully.")
 	
@@ -96,7 +100,6 @@ func _client_request_change_character(arguments):
 			old.rpc("set_owner", 1)
 
 func _character_death(arguments):
-	print(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"] + ".")