From 4ff3ed3e7cbd9a6250f05c1c8a4723fa81364dae Mon Sep 17 00:00:00 2001
From: Spencer Killen <sjkillen@ualberta.ca>
Date: Fri, 31 May 2024 16:47:56 -0600
Subject: [PATCH] fix server

---
 level/level.gd       | 1 -
 player/player.gd     | 6 ++++--
 server/lobby_list.gd | 6 +++++-
 server/server.gd     | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/level/level.gd b/level/level.gd
index 2f74c9f..7f06e7e 100644
--- a/level/level.gd
+++ b/level/level.gd
@@ -71,7 +71,6 @@ func server_add_player(id: int):
 	%PlayerSpawner.spawn(id)
 
 static func find_level(node: Node) -> Level:
-	var parent := node
 	while not (node is Level):
 		node = node.get_parent()
 	return node
diff --git a/player/player.gd b/player/player.gd
index 87c3616..c1dae50 100644
--- a/player/player.gd
+++ b/player/player.gd
@@ -27,6 +27,7 @@ func is_on_ground() -> bool:
 	
 
 func _physics_process(delta):
+	print(is_on_ground())
 	if not is_on_floor():
 		velocity.y -= gravity * delta
 
@@ -58,7 +59,7 @@ func get_first_bumper() -> Player:
 func _on_tag_detection_area_entered(area):
 	if not (area.get_parent() is Player):
 		return
-	var other_player: Player = area.get_parent()
+	var _other_player: Player = area.get_parent()
 	if is_bumping.is_connected(_bump_check):
 		return
 	is_bumping.connect(_bump_check)
@@ -66,7 +67,7 @@ func _on_tag_detection_area_entered(area):
 func _on_tag_detection_area_exited(area):
 	if not (area.get_parent() is Player):
 		return
-	var other_player: Player = area.get_parent()
+	var _other_player: Player = area.get_parent()
 	if not is_bumping.is_connected(_bump_check):
 		return
 	is_bumping.disconnect(_bump_check)
@@ -74,6 +75,7 @@ func _on_tag_detection_area_exited(area):
 
 func _on_tag_detection_body_entered(body):
 	if body.is_in_group("ground"):
+		print("fuck")
 		if not is_grounded.is_connected(body.grounded):
 			is_grounded.connect(body.grounded)
 
diff --git a/server/lobby_list.gd b/server/lobby_list.gd
index 0155a9b..dbf829e 100644
--- a/server/lobby_list.gd
+++ b/server/lobby_list.gd
@@ -3,8 +3,12 @@ extends Control
 signal join_lobby(addr: String, port: int)
 
 @rpc("reliable", "authority", "call_local")
-func add(addr: String, port: int):
+func add(port: int):
 	var lobby_button := preload("res://server/lobby_list_entry.tscn").instantiate()
+	var addr := "127.0.0.1"
+	var peer := (multiplayer.multiplayer_peer as ENetMultiplayerPeer).get_peer(1)
+	if peer != null:
+		addr = peer.get_remote_address()
 	lobby_button.address = addr
 	lobby_button.port = port
 	$Lobbies.add_child(lobby_button, true)
diff --git a/server/server.gd b/server/server.gd
index e79b7c5..a125169 100644
--- a/server/server.gd
+++ b/server/server.gd
@@ -19,14 +19,14 @@ func _ready():
 func peer_connected(id: int):
 	print("Client " + str(id) + " connected to master server")
 	for lobby in %LobbyList.lobbies():
-		%LobbyList.add.rpc_id(id, lobby.address, lobby.port)
+		%LobbyList.add.rpc_id(id, lobby.port)
 
 func create_lobby():
 	var lobby := preload("res://server/lobby.tscn").instantiate()
 	lobby.port = next_port_num
 	next_port_num += 1
 	%Lobbies.add_child(lobby)
-	%LobbyList.add.rpc(external_address, lobby.port)
+	%LobbyList.add.rpc(lobby.port)
 	
 func _on_create_lobby_pressed():
 	create_lobby()