diff --git a/RageCoop.Client/Properties/AssemblyInfo.cs b/RageCoop.Client/Properties/AssemblyInfo.cs
index b7fcdcb..c3f49ee 100644
--- a/RageCoop.Client/Properties/AssemblyInfo.cs
+++ b/RageCoop.Client/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@ using System.Resources;
// Version informationr(
-[assembly: AssemblyVersion("1.5.2.63")]
-[assembly: AssemblyFileVersion("1.5.2.63")]
+[assembly: AssemblyVersion("1.5.2.64")]
+[assembly: AssemblyFileVersion("1.5.2.64")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
diff --git a/RageCoop.Server/Networking/Server.Background.cs b/RageCoop.Server/Networking/Server.Background.cs
index 587f0c4..33d5786 100644
--- a/RageCoop.Server/Networking/Server.Background.cs
+++ b/RageCoop.Server/Networking/Server.Background.cs
@@ -172,10 +172,15 @@ namespace RageCoop.Server
{
foreach(var c in ClientsByNetHandle.Values.ToArray())
{
- if (c.EntitiesCount > 100 || c.Player.IsInvincible)
+ if (c.EntitiesCount > 100 && Settings.KickSpamming)
{
- c.Kick("Bye bye asshole~");
- API.SendChatMessage($"Asshole {c.Username} was kicked!");
+ c.Kick("Bye bye asshole: spamming");
+ API.SendChatMessage($"Asshole {c.Username} was kicked: Spamming");
+ }
+ else if (Settings.KickGodMode && c.Player.IsInvincible)
+ {
+ c.Kick("Bye bye asshole: godmode");
+ API.SendChatMessage($"Asshole {c.Username} was kicked: GodMode");
}
}
}
diff --git a/RageCoop.Server/Networking/Server.cs b/RageCoop.Server/Networking/Server.cs
index d689ea7..ec33edf 100644
--- a/RageCoop.Server/Networking/Server.cs
+++ b/RageCoop.Server/Networking/Server.cs
@@ -166,10 +166,8 @@ namespace RageCoop.Server
{
_updateTimer.Enabled = true;
}
- if (Settings.AntiAssholes)
- {
- _antiAssholesTimer.Enabled = true;
- }
+ _antiAssholesTimer.Enabled = true;
+
Logger?.Info("Listening for clients");
}
diff --git a/RageCoop.Server/Properties/AssemblyInfo.cs b/RageCoop.Server/Properties/AssemblyInfo.cs
index ac03692..0516a7a 100644
--- a/RageCoop.Server/Properties/AssemblyInfo.cs
+++ b/RageCoop.Server/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@ using System.Resources;
[assembly: AssemblyCulture("")]
// Version information
-[assembly: AssemblyVersion("1.5.2.77")]
-[assembly: AssemblyFileVersion("1.5.2.77")]
+[assembly: AssemblyVersion("1.5.2.78")]
+[assembly: AssemblyFileVersion("1.5.2.78")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
diff --git a/RageCoop.Server/Settings.cs b/RageCoop.Server/Settings.cs
index d2ba1b6..e3b6c80 100644
--- a/RageCoop.Server/Settings.cs
+++ b/RageCoop.Server/Settings.cs
@@ -111,8 +111,13 @@
public bool AutoUpdate { get; set; } = false;
///
- /// Kick godmode and spamming assholes
+ /// Kick godmode assholes
///
- public bool AntiAssholes { get; set; } = true;
+ public bool KickGodMode { get; set; } = false;
+
+ ///
+ /// Kick spamming assholes
+ ///
+ public bool KickSpamming { get; set; } = true;
}
}