Merge pull request #62 from developer9998/master

Fix for game update
legoandmars · Jun 26, 2024 · 2b9ddfd · 2b9ddfd
2 parents 5ad0b0e + 852e493
commit 2b9ddfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Utilla/GamemodeManager.cs b/Utilla/GamemodeManager.cs
@@ -71,8 +71,8 @@ struct GameModeSelectorPath
 					name = "TreehouseSelector",
 					buttonPath = "anchor",
 					gamemodesPath = "anchor",
-					transformToFind = "Environment Objects/LocalObjects_Prefab/TreeRoom/TreeRoomInteractables/UI/Selector Buttons"
-				}
+					transformToFind = "Environment Objects/LocalObjects_Prefab/TreeRoom/TreeRoomInteractables/UI/ModeSelector_Group/Selector Buttons"
+                }
 			},
 			{
 				"Beach",

diff --git a/Utilla/Utils/RoomUtils.cs b/Utilla/Utils/RoomUtils.cs
@@ -46,13 +46,13 @@ internal static string RandomString(int length)
 
 		/// <inheritdoc cref="JoinPrivateLobby(string, bool)"/>
 		/// <inheritdoc cref="JoinPrivateLobby(PhotonNetworkController)"/>
-		public static void JoinPrivateLobby(string code, PhotonNetworkController __instance, bool casual = false)
+		public static void JoinPrivateLobby(string code, PhotonNetworkController __instance, bool casual = false, JoinType joinType = JoinType.Solo)
 		{
 			RoomCode = code;
 			__instance.customRoomID = code;
 			__instance.isPrivate = true;
 			Debug.Log("attempting to connect");
-			__instance.AttemptToJoinSpecificRoom(code);
+			__instance.AttemptToJoinSpecificRoom(code, joinType);
 
 			if (casual)
 			{
@@ -105,8 +105,6 @@ public static void JoinModdedLobby(string map, bool casual = false)
 				joinTrigger = new GameObject("UtillaJoinTrigger").AddComponent<GorillaNetworkJoinTrigger>();
 				joinTrigger.makeSureThisIsDisabled = Array.Empty<GameObject>();
 				joinTrigger.makeSureThisIsEnabled = Array.Empty<GameObject>();
-				joinTrigger.joinScreens = Array.Empty<GorillaLevelScreen>();
-				joinTrigger.leaveScreens = Array.Empty<GorillaLevelScreen>();
 			}
 			joinTrigger.gameModeName = gameModeName;
 			photonNetworkController.AttemptToJoinPublicRoom(joinTrigger);