Merge pull request #52 from AHauntedArmy/master

fixed base paintbrawl, removed broken patch.

Utilla/GamemodeManager.cs

@@ -8,6 +8,7 @@
 using UnityEngine.SceneManagement;
 
 using GorillaNetworking;
+using GorillaGameModes;
 using BepInEx;
 using HarmonyLib;
 
@@ -28,7 +29,7 @@ public class GamemodeManager : MonoBehaviour
 			new Gamemode("MODDED_CASUAL", "MODDED CASUAL", BaseGamemode.Casual),
 			new Gamemode("MODDED_DEFAULT", "MODDED", BaseGamemode.Infection),
 			new Gamemode("MODDED_HUNT", "MODDED HUNT", BaseGamemode.Hunt),
-            new Gamemode("MODDED_BATTLE", "MODDED BRAWL", BaseGamemode.Paintbrawl)
+            new Gamemode("MODDED_BATTLE", "MODDED BRAWL", BaseGamemode.PaintbrawlBattle)
         };
 		public List<Gamemode> Gamemodes { get; private set; } = new List<Gamemode>() { 
 			new Gamemode("CASUAL", "CASUAL"),
@@ -301,7 +302,7 @@ void AddGamemodeToPrefabPool(Gamemode gamemode)
 					BaseGamemode.Casual => GameModeType.Casual,
 					BaseGamemode.Infection => GameModeType.Infection,
 					BaseGamemode.Hunt => GameModeType.Hunt,
-					BaseGamemode.Paintbrawl => GameModeType.Battle,
+					BaseGamemode.PaintbrawlBattle => GameModeType.Battle,
 					_ => null
 				};
 

Utilla/HarmonyPatches/Patches/MatchmakingRegionPatch.cs

@@ -126,6 +126,7 @@
 //     party to this document and has no duty or obligation with respect to
 //     this CC0 or use of the Work.
 
+/*
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -218,3 +219,4 @@ private static bool Prefix(PhotonNetworkController __instance, PhotonNetworkCont
 		}
 	}
 }
+*/

Utilla/Models/Gamemode.cs

@@ -29,8 +29,8 @@ public enum BaseGamemode
         /// <summary>
         /// Paintbrawl gamemode, a gamemode that lets you play a game of paintball with two or more players.
         /// </summary>
-        Paintbrawl
-    }
+        PaintbrawlBattle
+	}
 
 	public class Gamemode {
 		public const string GamemodePrefix = "MODDED_";