Use different method to reset FF

Author: LambdaGaming

RandomGamemode/EventHandlers.cs

@@ -33,7 +33,7 @@ public class EventHandlers
 	{
 		private Plugin plugin;
 		private Gamemode CurrentGamemode;
-		private bool FriendlyFireDefault;
+		private bool resetFriendlyFire;
 		System.Random rand = new System.Random();
 
 		public EventHandlers( Plugin plugin ) => this.plugin = plugin;
@@ -65,8 +65,8 @@ private IEnumerator<float> DelayedRoundEnd( float delay )
 		#region Gamemodes
 		public IEnumerator<float> DodgeBall()
 		{
-			FriendlyFireDefault = ServerConsole.FriendlyFire;
-			ServerConsole.FriendlyFire = true;
+			resetFriendlyFire = Server.FriendlyFire;
+			Server.FriendlyFire = true;
 			yield return Timing.WaitForSeconds( 3f );
 
 			foreach ( Player ply in Player.List )
@@ -166,8 +166,8 @@ public IEnumerator<float> NightOfTheLivingNerd()
 		public IEnumerator<float> Randomizer()
 		{
 			List<Player> PlyList = new List<Player>();
-			FriendlyFireDefault = ServerConsole.FriendlyFire;
-			ServerConsole.FriendlyFire = true;
+			resetFriendlyFire = Server.FriendlyFire;
+			Server.FriendlyFire = true;
 			yield return Timing.WaitForSeconds( 3f );
 
 			RoleTypeId[] roles = new RoleTypeId[] {
@@ -303,7 +303,16 @@ public void OnRoundStart()
 				Timing.RunCoroutine( DelayedRoundEnd( 900 ), "DelayedRoundEnd" );
 			}
 		}
-		
+
+		public void OnWaitingForPlayers()
+		{
+			if ( resetFriendlyFire )
+			{
+				Server.FriendlyFire = false;
+				resetFriendlyFire = false;
+			}
+		}
+
 		public void OnRoundEnding( EndingRoundEventArgs ev )
 		{
 			// Prevents randomizer round from ending if everyone is on the same team
@@ -327,7 +336,6 @@ public void OnRoundEnd( RoundEndedEventArgs ev )
 			{
 				Map.Broadcast( 6, string.Format( plugin.Config.EndText, Plugin.GetGamemodeName( CurrentGamemode ) ) );
 				CurrentGamemode = 0;
-				ServerConsole.FriendlyFire = FriendlyFireDefault;
 				Timing.KillCoroutines( "DelayedRoundEnd" );
 			}
 		}

RandomGamemode/Plugin.cs

@@ -9,8 +9,8 @@ namespace RandomGamemode
 	public class Plugin : Plugin<Config>
 	{
 		private EventHandlers EventHandlers;
-		public override Version Version { get; } = new Version( 2, 7, 1 );
-		public override Version RequiredExiledVersion { get; } = new Version( 9, 8, 0 );
+		public override Version Version { get; } = new Version( 2, 7, 2 );
+		public override Version RequiredExiledVersion { get; } = new Version( 9, 9, 0 );
 		public override string Author { get; } = "OPGman";
 		public override PluginPriority Priority { get; } = PluginPriority.Medium;
 
@@ -39,6 +39,7 @@ public override void OnEnabled()
 			base.OnEnabled();
 			EventHandlers = new EventHandlers( this );
 			events.Server.RoundStarted += EventHandlers.OnRoundStart;
+			events.Server.WaitingForPlayers += EventHandlers.OnWaitingForPlayers;
 			events.Server.RoundEnded += EventHandlers.OnRoundEnd;
 			events.Player.ThrownProjectile += EventHandlers.OnGrenadeThrown;
 			events.Player.DroppingItem += EventHandlers.OnItemDropped;
@@ -74,6 +75,7 @@ public override void OnDisabled()
 		{
 			base.OnDisabled();
 			events.Server.RoundStarted -= EventHandlers.OnRoundStart;
+			events.Server.WaitingForPlayers -= EventHandlers.OnWaitingForPlayers;
 			events.Server.RoundEnded -= EventHandlers.OnRoundEnd;
 			events.Player.ThrownProjectile -= EventHandlers.OnGrenadeThrown;
 			events.Player.DroppingItem -= EventHandlers.OnItemDropped;